ll-merge.c: remove implicit dependency on the_index
[git/git.git] / merge-blobs.c
index fabb8c1..668fb2e 100644 (file)
@@ -41,7 +41,8 @@ static void *three_way_filemerge(const char *path, mmfile_t *base, mmfile_t *our
         * common ancestor.
         */
        merge_status = ll_merge(&res, path, base, NULL,
-                               our, ".our", their, ".their", NULL);
+                               our, ".our", their, ".their",
+                               &the_index, NULL);
        if (merge_status < 0)
                return NULL;