diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:56 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:03 -0700 |
| commit | 9c0bbb50f0dd916fe1684991d10d93f3c67311ba (patch) | |
| tree | e14e44204d088f43ac962b62b83deebf46236b3e /config.mak.in | |
| parent | merge-recursive: Have process_entry() skip D/F or rename entries (diff) | |
| download | tgif-9c0bbb50f0dd916fe1684991d10d93f3c67311ba.tar.xz | |
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>
Diffstat (limited to 'config.mak.in')
0 files changed, 0 insertions, 0 deletions