Merge branch 'ab/rebase-in-c-escape-hatch'

diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 436b13ad21d06351ef9f9a027689a7e23ca97ba5..ef1322148e1413e4b90f46b6bea4f2d9b0300189 100755 (executable)
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -101,7 +101,7 @@ test_expect_success '-L with --first-parent and a merge' '
 test_expect_success '-L with --output' '
        git checkout parallel-change &&
        git log --output=log -L :main:b.c >output &&
-       test ! -s output &&
+       test_must_be_empty output &&
        test_line_count = 70 log
 '