From: Elijah Newren <newren@gmail.com>
Date: Mon, 20 Sep 2010 08:29:02 +0000 (-0600)
Subject: merge-recursive: Delay handling of rename/delete conflicts
X-Git-Tag: v1.7.4-rc0~101^2~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3b130adf9c8b0b37acb0959b84a3222bc22ebcff?ds=inline;hp=3b130adf9c8b0b37acb0959b84a3222bc22ebcff

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>
---