projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 384c166) | patch
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)
commit9c0bbb50f0dd916fe1684991d10d93f3c67311ba
treee14e44204d088f43ac962b62b83deebf46236b3etree | snapshot
parent384c166807e6eefbefa3e9f253216b2aee6d912acommit | diff
merge-recursive: Structure process_df_entry() to handle more cases

Modify process_df_entry() (mostly just indentation level changes) to
get it ready for handling more D/F conflict type cases.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | history
Git—the stupid content tracker