merge-recursive: Update conflict_rename_rename_1to2() call signature
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:57 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:03 +0000 (17:37 -0700)
commit36de170...8aaa3c3011c8b4ee1f89ee65b7ad2f99
treed27ed11...5c7467a52730746b2c0b0fe26ee90b59copy hash to clipboard (tree)
parent9c0bbb5...f0dd916fe1684991d10d93f3c67311bacopy hash to clipboard (diff)
merge-recursive.c