From: Elijah Newren <newren@gmail.com>
Date: Fri, 12 Aug 2011 05:20:15 +0000 (-0600)
Subject: merge-recursive: Defer rename/rename(2to1) handling until process_entry
X-Git-Tag: v1.7.7-rc1~28^2~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/461f5041178c02f3360920f42b542df7add0033f?hp=461f5041178c02f3360920f42b542df7add0033f

merge-recursive: Defer rename/rename(2to1) handling until process_entry

This puts the code for the different types of double rename conflicts
closer together (fewer lines of other code separating the two paths) and
increases similarity between how they are handled.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---