Merge branch 'nd/no-the-index'

diff --git a/merge-recursive.c b/merge-recursive.c
index bd053c70dfc518b6265ec273aad2e61c05d60d18..dcdc93019cec870f196191caf3055611faae4ede 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -966,7 +966,7 @@ static int update_file_flags(struct merge_options *o,
                }
                if (S_ISREG(mode)) {
                        struct strbuf strbuf = STRBUF_INIT;
-                       if (convert_to_working_tree(path, buf, size, &strbuf)) {
+                       if (convert_to_working_tree(&the_index, path, buf, size, &strbuf)) {
                                free(buf);
                                size = strbuf.len;
                                buf = strbuf_detach(&strbuf, NULL);