diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:55 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:03 -0700 |
| commit | 384c166807e6eefbefa3e9f253216b2aee6d912a (patch) | |
| tree | 9ffc2737d2c2318d44ceac4482adfb02bb3f1c6e /t/t2203-add-intent.sh | |
| parent | 2ff739f9d2fd2f34e7a7bfb9b5f2d1d2b2ec5326 (diff) | |
| download | git-384c166807e6eefbefa3e9f253216b2aee6d912a.tar.gz | |
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>
Diffstat (limited to 't/t2203-add-intent.sh')
0 files changed, 0 insertions, 0 deletions