t7800: "defaults" is no longer a builtin tool name

073678b8e6324a155fa99f40eee0637941a70a34 reworked the
mergetools/ directory so that every file corresponds to a
difftool-supported tool.  When this happened the "defaults"
file went away as it was no longer needed by mergetool--lib.

t7800 tests that configured commands can override builtins,
but this test was not adjusted when the "defaults" file was
removed because the test continued to pass.

Adjust the test to use the everlasting "vimdiff" tool name
instead of "defaults" so that it correctly tests against a tool
that is known by mergetool--lib.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

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
 '