merge-recursive: New data structures for deferring of D/F conflicts
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:53 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:38 +0000 (17:32 -0700)
commit25c3936...49ba052f0c7e9ba3ce138b89abcae6ee
treecad6903...537f824eaa339ad86478fde14986e27ccopy hash to clipboard (tree)
parent0c4918d...c1722c1faaa909f3f8486d5a0d816538copy hash to clipboard (diff)
merge-recursive.c