tree 91adeb02422aeb2b69418c9d3ca23ed9e14a7dfa
parent 8104ebfe8276657ee803cca7eb8665a78cf3ef83
author Johannes Schindelin <Johannes.Schindelin@gmx.de> 1229983820 +0100
committer Junio C Hamano <gitster@pobox.com> 1230188808 -0800

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>