summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-07-02 06:30:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-03 14:47:42 -0700
commit11d9ade10e50848b10107d281fcfafb785bfb112 (patch)
treec2f12eeb339418770c0b5cddf8f69268f7e619b9 /Documentation/git-merge-tree.txt
parentSecond batch for 2.19 cycle (diff)
downloadtgif-11d9ade10e50848b10107d281fcfafb785bfb112.tar.xz
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 <rcdailey.lists@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions