From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Aug 2018 22:30:39 +0000 (-0700)
Subject: Merge branch 'en/t6036-recursive-corner-cases'
X-Git-Tag: v2.19.0-rc0~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bba1a5559cd0015165563fd01d23bbd5e52bea72;p=thirdparty%2Fgit.git

Merge branch 'en/t6036-recursive-corner-cases'

Tests to cover more D/F conflict cases have been added for
merge-recursive.

* en/t6036-recursive-corner-cases:
  t6036: fix broken && chain in sub-shell
  t6036: add lots of detail for directory/file conflicts in recursive case
---

bba1a5559cd0015165563fd01d23bbd5e52bea72