Merge branch 'maint'

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index fb0027325d3e1aa031a5cb54f9842a28b84dca04..3aab6e15000f57e76d05f70920525d5734e20ef7 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -60,9 +60,9 @@ test_expect_success PERL 'custom commands' '
 '
 
 test_expect_success PERL 'custom tool commands override built-ins' '
-       test_config difftool.defaults.cmd "cat \"\$REMOTE\"" &&
+       test_config difftool.vimdiff.cmd "cat \"\$REMOTE\"" &&
        echo master >expect &&
-       git difftool --tool defaults --no-prompt branch >actual &&
+       git difftool --tool vimdiff --no-prompt branch >actual &&
        test_cmp expect actual
 '