summaryrefslogtreecommitdiff
path: root/pathspec.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-26 21:37:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-26 21:37:14 (GMT)
commit18b26b18c50637eaa8fb1ae5f42fd94c8ac99507 (patch)
treead35f5f2b5bf669f4d81798e107b8ded40393fdb /pathspec.c
parentdede29612a723a7da9f489fecbdf02500a018430 (diff)
parent907681e940d095a0ab96756a8cddfd4f63cd71e1 (diff)
downloadgit-18b26b18c50637eaa8fb1ae5f42fd94c8ac99507.zip
git-18b26b18c50637eaa8fb1ae5f42fd94c8ac99507.tar.gz
git-18b26b18c50637eaa8fb1ae5f42fd94c8ac99507.tar.bz2
Merge branch 'jk/no-diff-emit-common'
"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 'pathspec.c')
0 files changed, 0 insertions, 0 deletions