| commit | 587421ebddec17e6e9aaf55b61aa40ad4ad9e43e | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 11 Jul 2018 03:56:59 +0000 (10 20:56 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Jul 2018 16:40:04 +0000 (11 09:40 -0700) | ||
| tree | a3e63b7199c71359280199aa0b0c0015001f4228 | treesnapshot (tar.gz zip) |
| parent | e81c7d414588e92e3bf871fe6c78a32176dcf995 | commitdiff |
t7405: verify 'merge --abort' works after submodule/path conflicts
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7405-submodule-merge.sh | diffblobblamehistory |