]> git.ipfire.org Git - thirdparty/git.git/commit - git-merge-one-file.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6fd72e3) | patch
merge with /dev/null as base, instead of punting O==empty case
authorJunio C Hamano <junkio@cox.net>
Tue, 8 Nov 2005 06:03:46 +0000 (22:03 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 12 Nov 2005 05:18:17 +0000 (21:18 -0800)
commitf7d24bbefb06c40f7738f471dda561ab45496d24
tree1d119624876dc24e31d0f520fe86447ade63cec2tree | snapshot
parent6fd72e39af8a69615d32c3fd4d5fe0788f54a2eacommit | diff
merge with /dev/null as base, instead of punting O==empty case

Instead of leaving the path unmerged in a case where each side
adds different version of the same path, attempt to merge it
with empty base and leave "our" version in the index file, just
like we do for the case in conflicting merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-one-file.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.