Skip to content

Commit 6b82db9

Browse files
ramsay-jonesgitster
authored andcommitted
t6036: fix broken && chain in sub-shell
Signed-off-by: Ramsay Jones <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 327ac9c commit 6b82db9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t6036-recursive-corner-cases.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ test_expect_success 'setup differently handled merges of directory/file conflict
495495
test_write_lines 1 2 3 4 5 6 7 8 >a &&
496496
git add a &&
497497
git commit -m E3 &&
498-
git tag E3
498+
git tag E3 &&
499499
500500
git checkout C^0 &&
501501
test_must_fail git merge B^0 &&

0 commit comments

Comments
 (0)