| commit | 6044329cf14e922aad270778db88767e97147875 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Mar 2016 19:13:41 +0000 (10 11:13 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Mar 2016 19:13:42 +0000 (10 11:13 -0800) | ||
| tree | d90e9e8862b3d6723ff3cb2591eddb17cb5a81ec | treesnapshot (tar.gz zip) |
| parent | 28eec80b602559403cca96531dce2930ac362095 | commitdiff |
| parent | 907681e940d095a0ab96756a8cddfd4f63cd71e1 | commitdiff |
Merge branch 'jk/no-diff-emit-common' into maint
"git merge-tree" used to mishandle "both sides added" conflict with
its own "create a fake ancestor file that has the common parts of
what both sides have added and do a 3-way merge" logic; this has
been updated to use the usual "3-way merge with an empty blob as
the fake common ancestor file" approach used in the rest of the
system.
* jk/no-diff-emit-common:
xdiff: drop XDL_EMIT_COMMON
merge-tree: drop generate_common strategy
merge-one-file: use empty blob for add/add base
"git merge-tree" used to mishandle "both sides added" conflict with
its own "create a fake ancestor file that has the common parts of
what both sides have added and do a 3-way merge" logic; this has
been updated to use the usual "3-way merge with an empty blob as
the fake common ancestor file" approach used in the rest of the
system.
* jk/no-diff-emit-common:
xdiff: drop XDL_EMIT_COMMON
merge-tree: drop generate_common strategy
merge-one-file: use empty blob for add/add base
| git-merge-one-file.sh | diff1 | diff2 | blobhistory |
| merge-blobs.c | diff1 | diff2 | blobhistory |