![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@osdl.org> | |
| Wed, 30 Nov 2005 05:06:10 +0000 (21:06 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 30 Nov 2005 08:14:19 +0000 (00:14 -0800) | ||
| commit | 354b9b59b0a02ce7e32a7b0c10caaa1e3532f22b | |
| tree | 4c052b89be821bc8fc6366501ee0583432849e86 | tree | snapshot |
| parent | 10637b84d91cf8870d1db8609a10dc5e58722378 | commit | diff |
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>
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>
| git-merge-one-file.sh | diff | blob | history |