From 6b82db9b4267ed232755d20487c42d25eaf14816 Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Thu, 12 Jul 2018 16:32:25 +0100 Subject: [PATCH] t6036: fix broken && chain in sub-shell Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano --- t/t6036-recursive-corner-cases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 74e5920bc6..ef1c26ec58 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -495,7 +495,7 @@ test_expect_success 'setup differently handled merges of directory/file conflict test_write_lines 1 2 3 4 5 6 7 8 >a && git add a && git commit -m E3 && - git tag E3 + git tag E3 && git checkout C^0 && test_must_fail git merge B^0 &&