diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-11-07 22:03:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 21:18:17 -0800 |
| commit | f7d24bbefb06c40f7738f471dda561ab45496d24 (patch) | |
| tree | 1d119624876dc24e31d0f520fe86447ade63cec2 /git-resolve.sh | |
| parent | Show URL in the "Getting <foo> list" http-fetch messages (diff) | |
| download | tgif-f7d24bbefb06c40f7738f471dda561ab45496d24.tar.xz | |
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>
Diffstat (limited to 'git-resolve.sh')
0 files changed, 0 insertions, 0 deletions