diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-11 04:30:23 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-12 06:18:18 +0100 |
| commit | fd66dbf5297a4badec8c2accf8a0f9bd72e3f693 (patch) | |
| tree | 3cf84815426567391327f3feecec59f8ab9a610b /object.c | |
| parent | Documentation: git-apply --no-add (diff) | |
| download | git-fd66dbf5297a4badec8c2accf8a0f9bd72e3f693.tar.xz git-fd66dbf5297a4badec8c2accf8a0f9bd72e3f693.zip | |
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>
Diffstat (limited to 'object.c')
0 files changed, 0 insertions, 0 deletions