merge-recursive: Structure process_df_entry() to handle more cases
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:56 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:03 +0000 (17:37 -0700)
commit9c0bbb5...f0dd916fe1684991d10d93f3c67311ba
treee14e442...4d088f43ac962b62b83deebf46236b3ecopy hash to clipboard (tree)
parent384c166...07e6eefbefa3e9f253216b2aee6d912acopy hash to clipboard (diff)
merge-recursive.c