From: Elijah Newren <newren@gmail.com>
Date: Thu, 8 Nov 2018 04:40:29 +0000 (-0800)
Subject: merge-recursive: improve rename/rename(1to2)/add[/add] handling
X-Git-Tag: v2.21.0-rc0~134^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/48c9cb9d6d058bcf18e931a1ed0d88792bb506c9?hp=48c9cb9d6d058bcf18e931a1ed0d88792bb506c9

merge-recursive: improve rename/rename(1to2)/add[/add] handling

When we have a rename/rename(1to2) conflict, each of the renames can
collide with a file addition.  Each of these rename/add conflicts suffered
from the same kinds of problems that normal rename/add suffered from.
Make the code use handle_file_conflicts() as well so that we get all the
same fixes and consistent behavior between the different conflict types.

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