t7405: add a directory/submodule conflict
authorElijah Newren <newren@gmail.com>
Wed, 11 Jul 2018 03:56:58 +0000 (20:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2018 16:40:03 +0000 (09:40 -0700)
commite81c7d4...4588e92e3bf871fe6c78a32176dcf995
treedfdd5c6...4210f62eddc21554b2aaefd444c4c4b5copy hash to clipboard (tree)
parent594a867...f227e9a00b3b0c4d6a26c97d68651666copy hash to clipboard (diff)
t/t7405-submodule-merge.sh