summaryrefslogtreecommitdiff
path: root/t/helper
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-07-10 20:56:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-11 09:40:03 -0700
commit594a8673f227e9a00b3b0c4d6a26c97d68651666 (patch)
tree8ee59ed5badacd6b6970f3a4b3aa52619440d182 /t/helper
parentSecond batch for 2.19 cycle (diff)
downloadtgif-594a8673f227e9a00b3b0c4d6a26c97d68651666.tar.xz
t7405: add a file/submodule conflict
In the case of a file/submodule conflict, although both cannot exist at the same path, we expect both to be present somewhere for the user to be able to resolve the conflict with. Add a testcase for this. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/helper')
0 files changed, 0 insertions, 0 deletions