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>
Ramsay Jones committed
Jul 12, 2018 at 16:32 UTC
6b82db9b4267ed232755d20487c42d25eaf14816
1 file changed
+1
-1
t/t6036-recursive-corner-cases.sh
+1
-1
@@ -495,7 +495,7 @@ test_expect_success 'setup differently handled merges of directory/file conflict
495
test_write_lines 1 2 3 4 5 6 7 8 >a &&
496
git add a &&
497
git commit -m E3 &&
498
- git tag E3
498
+ git tag E3 &&
499
500
git checkout C^0 &&
501
test_must_fail git merge B^0 &&