t7405: verify 'merge --abort' works after submodule/path conflicts
authorElijah Newren <newren@gmail.com>
Wed, 11 Jul 2018 03:56:59 +0000 (20:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2018 16:40:04 +0000 (09:40 -0700)
commit587421e...ddec17e6e9aaf55b61aa40ad4ad9e43e
treea3e63b7...99c71359280199aa0b0c0015001f4228copy hash to clipboard (tree)
parente81c7d4...4588e92e3bf871fe6c78a32176dcf995copy hash to clipboard (diff)
t/t7405-submodule-merge.sh