diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 02:29:04 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:04 -0700 |
| commit | 71f7ffcc02a2f38436c59146b86897389130a538 (patch) | |
| tree | e28a7efbfae0ced88c94362c854e91ff443afb55 /t/t6022-merge-rename.sh | |
| parent | 882fd11aff6f0e8add77e75924678cce875a0eaf (diff) | |
| download | git-71f7ffcc02a2f38436c59146b86897389130a538.tar.gz | |
merge-recursive: Delay modify/delete conflicts if D/F conflict present
When handling merges with modify/delete conflicts, if the modified path is
involved in a D/F conflict, handle the issue in process_df_entry() rather
than process_entry().
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6022-merge-rename.sh')
0 files changed, 0 insertions, 0 deletions