From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Jun 2019 21:03:36 +0000 (-0700)
Subject: Merge branch 'en/merge-directory-renames-fix'
X-Git-Tag: v2.22.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20fbf7dd421d05399dfe916edf8eed1932b15e22;p=thirdparty%2Fgit.git

Merge branch 'en/merge-directory-renames-fix'

Recent code restructuring of merge-recursive engine introduced a
regression dealing with rename/add conflict.

* en/merge-directory-renames-fix:
  merge-recursive: restore accidentally dropped setting of path
---

20fbf7dd421d05399dfe916edf8eed1932b15e22