From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Oct 2019 01:45:19 +0000 (+0900)
Subject: Merge branch 'en/merge-recursive-cleanup' into next
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b5a32726b8cab0c15cabc4d4be884c8b09b3138;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 diff3 common ancestor label for virtual commits
---

7b5a32726b8cab0c15cabc4d4be884c8b09b3138