Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
revision.c: reduce implicit dependency the_repository
[gitweb.git]
/
builtin
/
merge-tree.c
diff --git
a/builtin/merge-tree.c
b/builtin/merge-tree.c
index f8023bae1e2eceaa8ea086f5d990d8bc4c0e6121..f32941fdabf7a1e0e89442264b225becab60c882 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)