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