merge-recursive: Move delete/modify handling into dedicated function
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:51 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:38 +0000 (17:32 -0700)
commit5e3ce66...b03bf14443ef8b4c60b407664f97040b
treea6139d7...0026f094ae73126fad0046639d44a84dcopy hash to clipboard (tree)
parent6ef2cb0...8f132e4649ef925a8e1950d3138054d5copy hash to clipboard (diff)
merge-recursive.c