From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Aug 2018 22:30:45 +0000 (-0700)
Subject: Merge branch 'en/t7405-recursive-submodule-conflicts'
X-Git-Tag: v2.19.0-rc0~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c99033060ff7511864e404c18040ffa236f81404;p=git

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

c99033060ff7511864e404c18040ffa236f81404