From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Mar 2016 19:13:41 +0000 (-0800)
Subject: Merge branch 'jk/no-diff-emit-common' into maint
X-Git-Tag: v2.7.3~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6044329cf14e922aad270778db88767e97147875

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
---

6044329cf14e922aad270778db88767e97147875