| commit | fd66dbf5297a4badec8c2accf8a0f9bd72e3f693 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 11 Nov 2005 03:30:23 +0000 (10 19:30 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 12 Nov 2005 05:18:18 +0000 (11 21:18 -0800) | ||
| tree | 3cf84815426567391327f3feecec59f8ab9a610b | treesnapshot (tar.gz zip) |
| parent | e433705dd4dc52c45e5d82b615f07b5a4b27f185 | commitdiff |
merge-one-file: use empty- or common-base condintionally in two-stage merge.
If two sides added the same path completely different thing, it is
easier to see the merge pivoting on /dev/null. So check the size of
the common section we have found, and empty it if it is too small.
Signed-off-by: Junio C Hamano <junkio@cox.net>
If two sides added the same path completely different thing, it is
easier to see the merge pivoting on /dev/null. So check the size of
the common section we have found, and empty it if it is too small.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge-one-file.sh | diffblobblamehistory |