From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Nov 2018 15:53:57 +0000 (+0900)
Subject: Merge branch 'en/merge-cleanup-more'
X-Git-Tag: v2.20.0-rc0~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff8e25e99e46b0425990d48c2f1d964a68fc3908;p=thirdparty%2Fgit.git

Merge branch 'en/merge-cleanup-more'

Further clean-up of merge-recursive machinery.

* en/merge-cleanup-more:
  merge-recursive: avoid showing conflicts with merge branch before HEAD
  merge-recursive: improve auto-merging messages with path collisions
---

ff8e25e99e46b0425990d48c2f1d964a68fc3908