merge-recursive: Rename conflict_rename_rename*() for clarity
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:48 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:37 +0000 (17:32 -0700)
commit09c01f8...6f65ffdde9a61708a5d74a372d68807a
tree3b69a7e...07f003be05aad5ed905ae16b55c35639copy hash to clipboard (tree)
parent41d70bd...a94d1bd1ec09d2a3d6ebd419abb25bcacopy hash to clipboard (diff)
merge-recursive.c