merge-recursive: Move rename/delete handling into dedicated function
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:50 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:38 +0000 (17:32 -0700)
commit6ef2cb0...8f132e4649ef925a8e1950d3138054d5
treecaff30b...4c5a7b66ea094afd6d50b5cdffb03ae0copy hash to clipboard (tree)
parent605c1bc...c46b60f76dfb4f89f76029b7bb13d232copy hash to clipboard (diff)
merge-recursive.c