Merge branch 'rs/match-trees-refactor'

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index b58fa1a23243e435f119afb9966b0a80cbc1e4d4..6a5ec32a2642253cb6bb8a05ff51fecc44aa4a00 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -185,7 +185,7 @@ test_expect_success 'default to @{upstream} when upstream arg is missing' '
 test_expect_success 'rebase -q is quiet' '
        git checkout -b quiet topic &&
        git rebase -q master >output.out 2>&1 &&
-       test ! -s output.out
+       test_must_be_empty output.out
 '
 
 test_expect_success 'Rebase a commit that sprinkles CRs in' '