Merge branch 'en/merge-directory-renames-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Jun 2019 21:03:36 +0000 (14:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Jun 2019 21:03:36 +0000 (14:03 -0700)
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

1  2 
merge-recursive.c
Simple merge