merge-blobs.c: remove implicit dependency on the_index

diff --git a/builtin/merge.c b/builtin/merge.c
index 8f4a5065c209b5b50e02271b48277fff90306338..592cb19caf6ae8056c99b23e0ba12c0571af47de 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -452,7 +452,7 @@ static void finish(struct commit *head_commit,
        }
        if (new_head && show_diffstat) {
                struct diff_options opts;
-               diff_setup(&opts);
+               repo_diff_setup(the_repository, &opts);
                opts.stat_width = -1; /* use full terminal width */
                opts.stat_graph_width = -1; /* respect statGraphWidth config */
                opts.output_format |=