diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2005-11-29 21:06:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-30 00:14:19 -0800 |
| commit | 354b9b59b0a02ce7e32a7b0c10caaa1e3532f22b (patch) | |
| tree | 4c052b89be821bc8fc6366501ee0583432849e86 /git-merge-recursive.py | |
| parent | 10637b84d91cf8870d1db8609a10dc5e58722378 (diff) | |
| download | git-354b9b59b0a02ce7e32a7b0c10caaa1e3532f22b.tar.gz | |
merge-one-file: leave unmerged index entries upon automerge failure.
When automerge fails, we used to collapse the path to stage0
from "our" branch, to help "diff-files" users to view the
half-merged state against the current HEAD. Now diff-files has
been taught how to compare with unmerged stage2,leaving them
unmerged is a better thing to do, especially this prevents the
unresolved conflicts to be committed by mistake.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions