merge-recursive: Have conflict_rename_delete reuse modify/delete code
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:20 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:39 +0000 (14:19 -0700)
commite03acb8...c1f03827210235dd72578b8b26f19c51
treefad3ab9...30a872700493276f20c894749191253fcopy hash to clipboard (tree)
parentb703325...0d2ba0f32b5006feff86d71242061011copy hash to clipboard (diff)
merge-recursive.c