ll-merge.c: remove implicit dependency on the_index

diff --git a/merge-blobs.c b/merge-blobs.c
index fabb8c19ce983962b45c415f66c11236fa906bfe..668fb2e05dd39ecb45f7f78a86949b2d98c80ebf 100644 (file)
--- a/merge-blobs.c
+++ b/merge-blobs.c
@@ -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;