Code

git-merge documentation: conflicting merge leaves higher stages in index
authorJunio C Hamano <junkio@cox.net>
Fri, 2 Dec 2005 09:05:35 +0000 (01:05 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 2 Dec 2005 09:08:14 +0000 (01:08 -0800)
commit3ace1fe34bbf24a62215d06614f9cf29a80def4a
treefc206c1ad60cfb6481cc51f6737ce728d1d8d83f
parent54dd99a127caf4d20e1b91a43949655763d188ed
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>
Documentation/git-merge.txt