Do not ignore merge options in interactive rebase

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index df82ec9ddae30acc5cad23886cbf6ff2de287e7f..300be86c385a93588e987f591357c57421b9cbae 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -457,7 +457,7 @@ test_expect_success 'disambiguation (1)' '
        test_must_fail git diff --quiet -- secondfile &&
        test -z "$(git diff --cached --name-only)" &&
        test -f secondfile &&
-       test ! -s secondfile
+       test_must_be_empty secondfile
 
 '