git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 695576f)
t6042: Add failing testcase for rename/modify/add-source conflict
authorElijah Newren <redacted>
Fri, 12 Aug 2011 05:19:35 +0000 (23:19 -0600)
committerJunio C Hamano <redacted>
Sun, 14 Aug 2011 21:19:31 +0000 (14:19 -0700)
commit58040239f59004f71d9ae70d0fcd9e0d4f6a3259
tree0dee948be35f2d2e9fd75d0532c83c29faf658dbtree | snapshot
parent695576fddd039b2fdc3cad52bbaab4d89e27b71ccommit | diff
t6042: Add failing testcase for rename/modify/add-source conflict

If there is a cleanly resolvable rename/modify conflict AND there is a new
file introduced on the renamed side of the merge whose name happens to
match that of the source of the rename (but is otherwise unrelated to the
rename), then git fails to cleanly resolve the merge despite the fact that
the new file should not cause any problems.

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t6042-merge-rename-corner-cases.sh diff | blob | history
git clone https://git.99rst.org/PROJECT