merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:25 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:40 +0000 (14:19 -0700)
commitf53d397...8cf41cc93aa140bb41bb7d3a6590e179
tree9f2759c...63dba3f84c6642a41db735d08fb751d2copy hash to clipboard (tree)
parent3f680ff...cf41c80b5c3a7ef4e7b417c0aa788dfbcopy hash to clipboard (diff)
merge-recursive.c
t/t6022-merge-rename.sh