merge-recursive: avoid clobbering untracked files with directory renames
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:11 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commit79c4759...f5c8c0008ae9281f20c2a041d4cabd93
tree8891718...1bb406243998cde584decd73fea00721copy hash to clipboard (tree)
parent9c0743f...1e45b3a0ffe166ac949a27f95a3e5c34copy hash to clipboard (diff)
merge-recursive.c
t/t6043-merge-rename-directories.sh