diff.c: remove implicit dependency on the_index

diff --git a/merge-recursive.c b/merge-recursive.c
index e5243dbc542d786a645a9c038c855a6ca30acaba..939843e81555e151fea6c897e81538f4abb74713 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1812,7 +1812,7 @@ static struct diff_queue_struct *get_diffpairs(struct merge_options *o,
        struct diff_queue_struct *ret;
        struct diff_options opts;
 
-       diff_setup(&opts);
+       repo_diff_setup(the_repository, &opts);
        opts.flags.recursive = 1;
        opts.flags.rename_empty = 0;
        opts.detect_rename = merge_detect_rename(o);