merge-recursive: Defer rename/rename(2to1) handling until process_entry
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:15 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:38 +0000 (14:19 -0700)
commit461f504...178c02f3360920f42b542df7add0033f
tree1bab160...a7e0e9412cfd22681072a3d15b3af0a6copy hash to clipboard (tree)
parenta99b7f2...56ebd2d1db59c578f3da003e36f259c4copy hash to clipboard (diff)
merge-recursive.c