projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from:
f7d24bb
)
merge with /dev/null as base, instead of punting O==empty case
author
Junio C Hamano
<junkio@cox.net>
Tue, 8 Nov 2005 06:03:46 +0000
(22:03 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Sat, 12 Nov 2005 05:18:17 +0000
(21:18 -0800)
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>
No differences found