]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 161cf7f) | patch
merge-recursive: Delay handling of rename/delete conflicts
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:29:02 +0000 (02:29 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:04 +0000 (17:37 -0700)
commit3b130adf9c8b0b37acb0959b84a3222bc22ebcff
tree441c3ce2735d7b968cf28e7b86b01182f6f9adc0tree | snapshot
parent161cf7f9490285700432f23a953f8e238f3469f5commit | diff
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>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.