git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e333175)
t6042: add testcase covering rename/add/delete conflict type
authorElijah Newren <redacted>
Mon, 2 Jul 2018 13:30:52 +0000 (06:30 -0700)
committerJunio C Hamano <redacted>
Tue, 3 Jul 2018 21:47:42 +0000 (14:47 -0700)
commit11d9ade10e50848b10107d281fcfafb785bfb112
treec2f12eeb339418770c0b5cddf8f69268f7e619b9tree | snapshot
parente3331758f12da22f4103eec7efe1b5304a9be5e9commit | diff
t6042: add testcase covering rename/add/delete conflict type

If a file is renamed on one side of history, and the other side of history
both deletes the original file and adds a new unrelated file in the way of
the rename, then we have what I call a rename/add/delete conflict.  Add a
testcase covering this scenario.

Reported-by: Robert Dailey <redacted>
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