worktree: rename is_worktree_locked to worktree_lock_reason

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 8cea8a74f2b7e89dfedca3688f2b9d8863055010..8fc108d305a33c4ba615837b60bda8175f2fb882 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -76,7 +76,7 @@ static void *result(struct merge_list *entry, unsigned long *size)
        their = NULL;
        if (entry)
                their = entry->blob;
-       return merge_blobs(path, base, our, their, size);
+       return merge_blobs(&the_index, path, base, our, their, size);
 }
 
 static void *origin(struct merge_list *entry, unsigned long *size)