From: Ramsay Jones <ramsay@ramsayjones.plus.com>
Date: Thu, 12 Jul 2018 15:32:25 +0000 (+0100)
Subject: t6036: fix broken && chain in sub-shell
X-Git-Tag: v2.19.0-rc0~113^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b82db9b4267ed232755d20487c42d25eaf14816;p=git

t6036: fix broken && chain in sub-shell

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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 &&