diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:45 -0700 |
| commit | c99033060ff7511864e404c18040ffa236f81404 (patch) | |
| tree | 087e4db68336f821b532e01b409af338a9ea05af /commit.c | |
| parent | e6da45c7cd40afcd8dc8462fc714532ec6d673f6 (diff) | |
| parent | 587421ebddec17e6e9aaf55b61aa40ad4ad9e43e (diff) | |
Merge branch 'en/t7405-recursive-submodule-conflicts'
Tests to cover conflict cases that involve submodules have been
added for merge-recursive.
* en/t7405-recursive-submodule-conflicts:
t7405: verify 'merge --abort' works after submodule/path conflicts
t7405: add a directory/submodule conflict
t7405: add a file/submodule conflict
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions