Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rerere.c: remove implicit dependency on the_index
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 939843e81555e151fea6c897e81538f4abb74713..7edcda4db05c7c4ba34a4ea2eb19f5df57a27e59 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-1083,7
+1083,8
@@
static int merge_3way(struct merge_options *o,
read_mmblob(&src2, &b->oid);
merge_status = ll_merge(result_buf, a->path, &orig, base_name,
- &src1, name1, &src2, name2, &ll_opts);
+ &src1, name1, &src2, name2,
+ &the_index, &ll_opts);
free(base_name);
free(name1);