difftool: fallback on merge.guitool

diff --git a/t/t2204-add-ignored.sh b/t/t2204-add-ignored.sh
index 8340ac2f073446963f7f5dab39ac87771264da54..2e07365bbb055d27f558c78d26f657e314397398 100755 (executable)
--- a/t/t2204-add-ignored.sh
+++ b/t/t2204-add-ignored.sh
@@ -31,7 +31,7 @@ do
                rm -f .git/index &&
                test_must_fail git add "$i" 2>err &&
                git ls-files "$i" >out &&
-               ! test -s out
+               test_must_be_empty out
        '
 
        test_expect_success "complaints for ignored $i output" '
@@ -42,7 +42,7 @@ do
                rm -f .git/index &&
                test_must_fail git add "$i" file 2>err &&
                git ls-files "$i" >out &&
-               ! test -s out
+               test_must_be_empty out
        '
        test_expect_success "complaints for ignored $i with unignored file output" '
                test_i18ngrep -e "Use -f if" err
@@ -57,7 +57,7 @@ do
                        cd dir &&
                        test_must_fail git add "$i" 2>err &&
                        git ls-files "$i" >out &&
-                       ! test -s out
+                       test_must_be_empty out
                )
        '
 
@@ -77,7 +77,7 @@ do
                        cd sub &&
                        test_must_fail git add "$i" 2>err &&
                        git ls-files "$i" >out &&
-                       ! test -s out
+                       test_must_be_empty out
                )
        '