| commit | 9c0bbb50f0dd916fe1684991d10d93f3c67311ba | |
| author | Elijah Newren <newren@gmail.com> | |
| Mon, 20 Sep 2010 08:28:56 +0000 (20 02:28 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Sep 2010 00:37:03 +0000 (29 17:37 -0700) | ||
| tree | e14e44204d088f43ac962b62b83deebf46236b3e | treesnapshot (tar.gz zip) |
| parent | 384c166807e6eefbefa3e9f253216b2aee6d912a | commitdiff |
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>
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 | diffblobblamehistory |