merge-recursive: restore accidentally dropped setting of path
authorElijah Newren <newren@gmail.com>
Tue, 4 Jun 2019 20:27:50 +0000 (13:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jun 2019 16:30:40 +0000 (09:30 -0700)
commit481de8a...93bfaa5425ea4dc5ac70aaf3081a3be8
tree195e044...307a7c9460641f50d73fe28385214c1dcopy hash to clipboard (tree)
parent8c8e5bd...eb331d055aa7fa6345f6dcdadd658979copy hash to clipboard (diff)
merge-recursive.c
t/t6042-merge-rename-corner-cases.sh