diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-07-10 20:56:59 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-11 09:40:04 -0700 |
| commit | 587421ebddec17e6e9aaf55b61aa40ad4ad9e43e (patch) | |
| tree | a3e63b7199c71359280199aa0b0c0015001f4228 /t/t1501-work-tree.sh | |
| parent | t7405: add a directory/submodule conflict (diff) | |
| download | tgif-587421ebddec17e6e9aaf55b61aa40ad4ad9e43e.tar.xz | |
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>
Diffstat (limited to 't/t1501-work-tree.sh')
0 files changed, 0 insertions, 0 deletions