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)
commit20fbf7dd421d05399dfe916edf8eed1932b15e22
treed5b5cb5328fef4176ccc2d09be1172ac8de89a02
parent74583d89127e21255c12dd3c8a3bf60b497d7d03
parent481de8a293bfaa5425ea4dc5ac70aaf3081a3be8
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
merge-recursive.c