projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8104ebf) | patch
merge-recursive: mark rename/delete conflict as unmerged
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Mon, 22 Dec 2008 22:10:20 +0000 (23:10 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Dec 2008 07:06:48 +0000 (23:06 -0800)
commit36e3b5eafe967cb721f5e2bbaa396f979b8ebd7c
tree91adeb02422aeb2b69418c9d3ca23ed9e14a7dfatree | snapshot
parent8104ebfe8276657ee803cca7eb8665a78cf3ef83commit | diff
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>
merge-recursive.c diff | blob | history
t/t6024-recursive-merge.sh diff | blob | history
Git—the stupid content tracker