From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Oct 2019 02:04:52 +0000 (+0900)
Subject: Merge branch 'en/merge-recursive-cleanup' into next
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aab23cae2e62d7a6d4cfd1afe484873177928572;p=git

Merge branch 'en/merge-recursive-cleanup' into next

The merge-recursive machiery is one of the most complex parts of
the system that accumulated cruft over time.  This large series
cleans up the implementation quite a bit.

* en/merge-recursive-cleanup:
  merge-recursive: fix the fix to the diff3 common ancestor label
---

aab23cae2e62d7a6d4cfd1afe484873177928572