merge-recursive: Small cleanups for conflict_rename_rename_1to2
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:14 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:38 +0000 (14:19 -0700)
commita99b7f2...56ebd2d1db59c578f3da003e36f259c4
treee109f90...74a5a95b38f965e28a41044ac07536f4copy hash to clipboard (tree)
parentc52ff85...97c698c902870305a010e2303e297b87copy hash to clipboard (diff)
merge-recursive.c