Merge branch 'cc/doc-recommend-performance-trace-to-file'

diff --git a/builtin/merge.c b/builtin/merge.c
index 101ffeff4c942636e0ca688357a4b8ec8aa2a431..c8154aaf6a5afa87ab42d3db632798698a9f2b1d 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1187,6 +1187,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
        else
                head_commit = lookup_commit_or_die(head_sha1, "HEAD");
 
+       init_diff_ui_defaults();
        git_config(git_merge_config, NULL);
 
        if (branch_mergeoptions)