t7405: add a file/submodule conflict
authorElijah Newren <newren@gmail.com>
Wed, 11 Jul 2018 03:56:57 +0000 (20:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2018 16:40:03 +0000 (09:40 -0700)
commit594a867...f227e9a00b3b0c4d6a26c97d68651666
tree8ee59ed...badacd6b6970f3a4b3aa52619440d182copy hash to clipboard (tree)
parente333175...f12da22f4103eec7efe1b5304a9be5e9copy hash to clipboard (diff)
t/t7405-submodule-merge.sh