difftool: fallback on merge.guitool

diff --git a/t/t4047-diff-dirstat.sh b/t/t4047-diff-dirstat.sh
index 447a8ffa3a111dcc6ddec8b6081097f4127d2e59..7fec2cb9cd783f5aeff27236c8e54ddb2241e1be 100755 (executable)
--- a/t/t4047-diff-dirstat.sh
+++ b/t/t4047-diff-dirstat.sh
@@ -940,7 +940,7 @@ test_expect_success 'diff.dirstat=0,lines' '
 test_expect_success '--dirstat=future_param,lines,0 should fail loudly' '
        test_must_fail git diff --dirstat=future_param,lines,0 HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
        test_debug "cat actual_error" &&
-       test_cmp /dev/null actual_diff_dirstat &&
+       test_must_be_empty actual_diff_dirstat &&
        test_i18ngrep -q "future_param" actual_error &&
        test_i18ngrep -q "\--dirstat" actual_error
 '
@@ -948,7 +948,7 @@ test_expect_success '--dirstat=future_param,lines,0 should fail loudly' '
 test_expect_success '--dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters' '
        test_must_fail git diff --dirstat=dummy1,cumulative,2dummy HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
        test_debug "cat actual_error" &&
-       test_cmp /dev/null actual_diff_dirstat &&
+       test_must_be_empty actual_diff_dirstat &&
        test_i18ngrep -q "dummy1" actual_error &&
        test_i18ngrep -q "2dummy" actual_error &&
        test_i18ngrep -q "\--dirstat" actual_error