Merge branch 'maint'

diff --git a/t/t3031-merge-criscross.sh b/t/t3031-merge-criscross.sh
index 7f41607c569866e493e162e5078ff741bd520d09..e59b0a32d67ec86074059eee7a64c4b7bae6c145 100755 (executable)
--- a/t/t3031-merge-criscross.sh
+++ b/t/t3031-merge-criscross.sh
@@ -32,7 +32,7 @@ test_expect_success 'setup repo with criss-cross history' '
        do
                echo $n > data/$n &&
                n=$(($n+1)) ||
-               break
+               return 1
        done &&
 
        # check them in