diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-03-10 11:13:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 11:13:42 -0800 |
| commit | 6044329cf14e922aad270778db88767e97147875 (patch) | |
| tree | d90e9e8862b3d6723ff3cb2591eddb17cb5a81ec /t/t6038-merge-text-auto.sh | |
| parent | Merge branch 'jc/am-i-v-fix' into maint (diff) | |
| parent | xdiff: drop XDL_EMIT_COMMON (diff) | |
| download | tgif-6044329cf14e922aad270778db88767e97147875.tar.xz | |
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
Diffstat (limited to 't/t6038-merge-text-auto.sh')
0 files changed, 0 insertions, 0 deletions