summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-02 09:05:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-02 09:08:14 (GMT)
commit3ace1fe34bbf24a62215d06614f9cf29a80def4a (patch)
treefc206c1ad60cfb6481cc51f6737ce728d1d8d83f /Documentation/git-read-tree.txt
parent54dd99a127caf4d20e1b91a43949655763d188ed (diff)
downloadgit-3ace1fe34bbf24a62215d06614f9cf29a80def4a.zip
git-3ace1fe34bbf24a62215d06614f9cf29a80def4a.tar.gz
git-3ace1fe34bbf24a62215d06614f9cf29a80def4a.tar.bz2
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>
Diffstat (limited to 'Documentation/git-read-tree.txt')
0 files changed, 0 insertions, 0 deletions