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

Merge branch 'en/t6036-merge-recursive-tests'

Tests to cover various conflicting cases have been added for
merge-recursive.

* en/t6036-merge-recursive-tests:
  t6036: add a failed conflict detection case: regular files, different modes
  t6036: add a failed conflict detection case with conflicting types
  t6036: add a failed conflict detection case with submodule add/add
  t6036: add a failed conflict detection case with submodule modify/modify
  t6036: add a failed conflict detection case with symlink add/add
  t6036: add a failed conflict detection case with symlink modify/modify
---

e6da45c7cd40afcd8dc8462fc714532ec6d673f6