diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-12-25 11:57:11 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-12-25 17:10:10 -0800 |
commit | 4421a8235783d0664faa9a1d45be114fd7ad8206 (patch) | |
tree | 90505e56f05e1125140a21516a19667176da6e73 /ll-merge.c | |
parent | 4a39f79d3482cd844443b4ef9a8ef9b3d72faa5b (diff) | |
download | git-4421a8235783d0664faa9a1d45be114fd7ad8206.tar.gz git-4421a8235783d0664faa9a1d45be114fd7ad8206.tar.xz |
resolve-undo: "checkout -m path" uses resolve-undo information
Once you resolved conflicts by "git add path", you cannot recreate the
conflicted state with "git checkout -m path", because you lost information
from higher stages in the index when you resolved them.
Since we record the necessary information in the resolve-undo index
extension these days, we can reproduce the unmerged state in the index and
check it out.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions