difftool: fallback on merge.guitool

diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index a0fc4005e059723dbafb26606548a074554bc961..5475afc052934677c4f87adf4f29da507b4c6844 100755 (executable)
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -210,7 +210,7 @@ test_expect_success TTY 'push --quiet silences status and progress' '
        cd "$ROOT_PATH"/test_repo_clone &&
        test_commit quiet &&
        test_terminal git push --quiet >output 2>&1 &&
-       test_cmp /dev/null output
+       test_must_be_empty output
 '
 
 test_expect_success TTY 'push --no-progress silences progress but not status' '