Elijah Newren 3672c97148 merge-recursive: Fix working copy handling for rename/rename/add/add ...

If either side of a rename/rename(1to2) conflict is itself also involved
in a rename/add-dest conflict, then we need to make sure both the rename
and the added file appear in the working copy.

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

2011-08-14 14:19:39 -07:00

13 KiB

Executable File

Raw Blame History

View Raw