| commit | 36e3b5eafe967cb721f5e2bbaa396f979b8ebd7c | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Mon, 22 Dec 2008 22:10:20 +0000 (22 23:10 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Dec 2008 07:06:48 +0000 (24 23:06 -0800) | ||
| tree | 91adeb02422aeb2b69418c9d3ca23ed9e14a7dfa | treesnapshot (tar.gz zip) |
| parent | 8104ebfe8276657ee803cca7eb8665a78cf3ef83 | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory | |
| t/t6024-recursive-merge.sh | diffblobblamehistory |