summaryrefslogtreecommitdiff
path: root/t/t4256/1
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-06-06 14:03:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-06-06 14:03:36 -0700
commit20fbf7dd421d05399dfe916edf8eed1932b15e22 (patch)
treed5b5cb5328fef4176ccc2d09be1172ac8de89a02 /t/t4256/1
parentGit 2.22-rc3 (diff)
parentmerge-recursive: restore accidentally dropped setting of path (diff)
downloadtgif-20fbf7dd421d05399dfe916edf8eed1932b15e22.tar.xz
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
Diffstat (limited to 't/t4256/1')
0 files changed, 0 insertions, 0 deletions