t7405: verify 'merge --abort' works after submodule/path conflicts
authorElijah Newren <redacted>
Wed, 11 Jul 2018 03:56:59 +0000 (20:56 -0700)
committerJunio C Hamano <redacted>
Wed, 11 Jul 2018 16:40:04 +0000 (09:40 -0700)
commit587421ebddec17e6e9aaf55b61aa40ad4ad9e43e
treea3e63b7199c71359280199aa0b0c0015001f4228
parente81c7d414588e92e3bf871fe6c78a32176dcf995
t7405: verify 'merge --abort' works after submodule/path conflicts

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t7405-submodule-merge.sh
git clone https://git.99rst.org/PROJECT