From: Elijah Newren <newren@gmail.com>
Date: Thu, 19 Apr 2018 17:58:15 +0000 (-0700)
Subject: merge-recursive: avoid spurious rename/rename conflict from dir renames
X-Git-Tag: v2.18.0-rc0~50^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6e7e027fe5f4a8d61597a86e7f2b6087e23a759c?hp=6e7e027fe5f4a8d61597a86e7f2b6087e23a759c

merge-recursive: avoid spurious rename/rename conflict from dir renames

If a file on one side of history was renamed, and merely modified on the
other side, then applying a directory rename to the modified side gives us
a rename/rename(1to2) conflict.  We should only apply directory renames to
pairs representing either adds or renames.

Making this change means that a directory rename testcase that was
previously reported as a rename/delete conflict will now be reported as a
modify/delete conflict.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---