documentation fix: git difftool uses diff tools, not merge tools.

diff --git a/parse-options-cb.c b/parse-options-cb.c
index c248f667c1cc48075fb278a3309f74c7122502eb..6db0921fc1fde3b5fbf829577bdd019ae95462e0 100644 (file)
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -40,7 +40,7 @@ int parse_opt_color_flag_cb(const struct option *opt, const char *arg,
 
        if (!arg)
                arg = unset ? "never" : (const char *)opt->defval;
-       value = git_config_colorbool(NULL, arg, -1);
+       value = git_config_colorbool(NULL, arg);
        if (value < 0)
                return opterror(opt,
                        "expects \"always\", \"auto\", or \"never\"", 0);