diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 02:29:02 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:04 -0700 |
| commit | 3b130adf9c8b0b37acb0959b84a3222bc22ebcff (patch) | |
| tree | 441c3ce2735d7b968cf28e7b86b01182f6f9adc0 /git-merge-one-file.sh | |
| parent | 161cf7f9490285700432f23a953f8e238f3469f5 (diff) | |
| download | git-3b130adf9c8b0b37acb0959b84a3222bc22ebcff.tar.gz | |
merge-recursive: Delay handling of rename/delete conflicts
Move the handling of rename/delete conflicts from process_renames() to
process_df_entry().
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions