Merge branch 'en/t7405-recursive-submodule-conflicts'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:45 +0000 (15:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:45 +0000 (15:30 -0700)
commitc99033060ff7511864e404c18040ffa236f81404
tree087e4db68336f821b532e01b409af338a9ea05af
parente6da45c7cd40afcd8dc8462fc714532ec6d673f6
parent587421ebddec17e6e9aaf55b61aa40ad4ad9e43e
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