ll-merge.c: remove implicit dependency on the_index

diff --git a/notes-merge.c b/notes-merge.c
index 9b154a5da6b27ea9ad55b3404d5e3ad4f7c8d744..432edfb89afb29b992dbbd103a6eeecc52c5db8f 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -348,7 +348,8 @@ static int ll_merge_in_worktree(struct notes_merge_options *o,
        read_mmblob(&remote, &p->remote);
 
        status = ll_merge(&result_buf, oid_to_hex(&p->obj), &base, NULL,
-                         &local, o->local_ref, &remote, o->remote_ref, NULL);
+                         &local, o->local_ref, &remote, o->remote_ref,
+                         &the_index, NULL);
 
        free(base.ptr);
        free(local.ptr);