From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Aug 2019 21:26:10 +0000 (-0700)
Subject: Merge branch 'en/disable-dir-rename-in-recursive-merge'
X-Git-Tag: v2.23.0-rc2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0bdaec1d3db90d69041531311fb34fa09639589b;p=thirdparty%2Fgit.git

Merge branch 'en/disable-dir-rename-in-recursive-merge'

"merge-recursive" hit a BUG() when building a virtual merge base
detected a directory rename.

* en/disable-dir-rename-in-recursive-merge:
  merge-recursive: avoid directory rename detection in recursive case
---

0bdaec1d3db90d69041531311fb34fa09639589b