From: Elijah Newren <newren@gmail.com>
Date: Fri, 12 Aug 2011 05:20:21 +0000 (-0600)
Subject: merge-recursive: add handling for rename/rename/add-dest/add-dest
X-Git-Tag: v1.7.7-rc1~28^2~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1ac91b32b5f153a91c10fb236a3769541be60ae9?ds=inline;hp=1ac91b32b5f153a91c10fb236a3769541be60ae9

merge-recursive: add handling for rename/rename/add-dest/add-dest

Each side of the rename in rename/rename(1to2) could potentially also be
involved in a rename/add conflict.  Ensure stages for such conflicts are
also recorded.

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