From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Feb 2016 21:37:14 +0000 (-0800)
Subject: Merge branch 'jk/no-diff-emit-common'
X-Git-Tag: v2.8.0-rc0~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18b26b18c50637eaa8fb1ae5f42fd94c8ac99507;p=git

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

18b26b18c50637eaa8fb1ae5f42fd94c8ac99507