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 /git-merge-one-file.sh | |
| parent | 28eec80b602559403cca96531dce2930ac362095 (diff) | |
| parent | 907681e940d095a0ab96756a8cddfd4f63cd71e1 (diff) | |
| download | git-6044329cf14e922aad270778db88767e97147875.tar.gz | |
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 'git-merge-one-file.sh')
| -rwxr-xr-x | git-merge-one-file.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index cdc02af517..424b034e34 100755 --- a/git-merge-one-file.sh +++ b/git-merge-one-file.sh @@ -120,8 +120,7 @@ case "${1:-.}${2:-.}${3:-.}" in case "$1" in '') echo "Added $4 in both, but differently." - orig=$(git-unpack-file $2) - create_virtual_base "$orig" "$src2" + orig=$(git-unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391) ;; *) echo "Auto-merging $4" |