]> granicus.if.org Git - git/commit
Merge branch 'en/t6036-recursive-corner-cases'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:39 +0000 (15:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:39 +0000 (15:30 -0700)
commitbba1a5559cd0015165563fd01d23bbd5e52bea72
tree52996b6408a653c15b720e3b7e04292e8f53e6b5
parentbc6d33e87ac930286fe0bfc882b837bba4b18501
parent6b82db9b4267ed232755d20487c42d25eaf14816
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