merge-recursive: avoid clobbering untracked files with directory renames
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:52:01 +0000 (10:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 22:11:58 +0000 (14:11 -0800)
commit7b3d3b0...811c3d603d47d50eb3c8775571845a80
treefc58e4f...e20da1265d3656935fc3487e8ee70a0ccopy hash to clipboard (tree)
parent3b9616f...49e46e1a97bf6dd5bc727a663d92ddedcopy hash to clipboard (diff)
merge-recursive.c
t/t6043-merge-rename-directories.sh