Johannes Schindelin 36e3b5eafe merge-recursive: mark rename/delete conflict as unmerged ...

When a file was renamed in one branch, but deleted in the other, one
should expect the index to contain an unmerged entry, namely the
target of the rename.  Make it so.

Noticed by Constantine Plotnikov.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2008-12-24 23:06:48 -08:00

2.9 KiB

Executable File

Raw Blame History

View Raw