xdl_merge(): make XDL_MERGE_ZEALOUS output simpler

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index 9c0411165691bb1c3a581e9927e124e55fbd7bfd..4abe3c28fbf98542db35c13f618b7088225740e9 100644 (file)
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -21,7 +21,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
 
        prefix = setup_git_directory_gently(&nongit);
        init_revisions(&rev, prefix);
-       git_config(git_default_config); /* no "diff" UI options */
+       git_config(git_diff_basic_config); /* no "diff" UI options */
        rev.abbrev = 0;
 
        if (!setup_diff_no_index(&rev, argc, argv, nongit, prefix))