From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Mar 2020 18:21:20 +0000 (-0700)
Subject: Merge branch 'en/merge-path-collision'
X-Git-Tag: v2.26.0-rc1~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1075adfdf2d2008d665dc57b37c1f027f4ffd42;p=thirdparty%2Fgit.git

Merge branch 'en/merge-path-collision'

Handling of conflicting renames in merge-recursive have further
been made consistent with how existing codepaths try to mimic what
is done to add/add conflicts.

* en/merge-path-collision:
  merge-recursive: apply collision handling unification to recursive case
---

d1075adfdf2d2008d665dc57b37c1f027f4ffd42