summaryrefslogtreecommitdiff
path: root/t/t6407-merge-binary.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6407-merge-binary.sh')
-rwxr-xr-xt/t6407-merge-binary.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6407-merge-binary.sh b/t/t6407-merge-binary.sh
index e34676c204..8e6241f92e 100755
--- a/t/t6407-merge-binary.sh
+++ b/t/t6407-merge-binary.sh
@@ -48,7 +48,7 @@ test_expect_success resolve '
echo Oops, should not have succeeded
false
else
- git ls-files -s >current
+ git ls-files -s >current &&
test_cmp expect current
fi
'
@@ -63,7 +63,7 @@ test_expect_success recursive '
echo Oops, should not have succeeded
false
else
- git ls-files -s >current
+ git ls-files -s >current &&
test_cmp expect current
fi
'