• Junio C Hamano's avatar
    Merge branch 'jk/no-diff-emit-common' · 18b26b18
    Junio C Hamano authored
    "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
    * 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
merge-blobs.c 1.92 KB