| commit | 384c166807e6eefbefa3e9f253216b2aee6d912a | |
| author | Elijah Newren <newren@gmail.com> | |
| Mon, 20 Sep 2010 08:28:55 +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 | 9ffc2737d2c2318d44ceac4482adfb02bb3f1c6e | treesnapshot (tar.gz zip) |
| parent | 2ff739f9d2fd2f34e7a7bfb9b5f2d1d2b2ec5326 | commitdiff |
merge-recursive: Have process_entry() skip D/F or rename entries
If an entry has an associated rename_df_conflict_info, skip it and allow
it to be processed by process_df_entry().
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If an entry has an associated rename_df_conflict_info, skip it and allow
it to be processed by process_df_entry().
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory |