Merge branch 'bc/connect-plink' into maint

diff --git a/t/t4024-diff-optimize-common.sh b/t/t4024-diff-optimize-common.sh
index c4d733f5db6a4d390762505b770954cdbf6cc82f..7e76018296c8f0c51b7187c96330d6e0a70a2fe4 100755 (executable)
--- a/t/t4024-diff-optimize-common.sh
+++ b/t/t4024-diff-optimize-common.sh
@@ -139,7 +139,7 @@ test_expect_success setup '
                ( printf C; zs $n ) >file-c$n &&
                ( echo D; zs $n ) >file-d$n &&
 
-               expect_pattern $n || break
+               expect_pattern $n || return 1
 
        done >expect
 '