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)
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


Trivial merge