| commit | 3ace1fe34bbf24a62215d06614f9cf29a80def4a | |
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 2 Dec 2005 09:05:35 +0000 (2 01:05 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 2 Dec 2005 09:08:14 +0000 (2 01:08 -0800) | ||
| tree | fc206c1ad60cfb6481cc51f6737ce728d1d8d83f | treesnapshot (tar.gz zip) |
| parent | 54dd99a127caf4d20e1b91a43949655763d188ed | commitdiff |
git-merge documentation: conflicting merge leaves higher stages in index
This hopefully concludes the latest updates that changes the
behaviour of the merge on an unsuccessful automerge. Instead of
collapsing the conflicted path in the index to show HEAD, we
leave it unmerged, now that diff-files can compare working tree
files with higher stages.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This hopefully concludes the latest updates that changes the
behaviour of the merge on an unsuccessful automerge. Instead of
collapsing the conflicted path in the index to show HEAD, we
leave it unmerged, now that diff-files can compare working tree
files with higher stages.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Documentation/git-merge.txt | diffblobblamehistory |