summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-17 05:45:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-17 07:45:33 (GMT)
commit15b4f7a68d8c3c8ee28424415b203f61202d65d1 (patch)
treea580a0e5f784046497a05eae485f1e90154b8bdf /merge-tree.c
parent9914cf468941067b4f3deb9c69c11af3f5b45ccc (diff)
downloadgit-15b4f7a68d8c3c8ee28424415b203f61202d65d1.zip
git-15b4f7a68d8c3c8ee28424415b203f61202d65d1.tar.gz
git-15b4f7a68d8c3c8ee28424415b203f61202d65d1.tar.bz2
merge-tree: use ll_merge() not xdl_merge()
ll_merge() interface was designed to merge contents under git control while taking per-path attributes into account. Update the three-way merge implementation used by merge-tree to use it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-tree.c')
-rw-r--r--merge-tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-tree.c b/merge-tree.c
index f01e7c8..37b94d9 100644
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -54,7 +54,7 @@ static const char *explanation(struct merge_list *entry)
return "removed in remote";
}
-extern void *merge_file(struct blob *, struct blob *, struct blob *, unsigned long *);
+extern void *merge_file(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);
static void *result(struct merge_list *entry, unsigned long *size)
{
@@ -76,7 +76,7 @@ static void *result(struct merge_list *entry, unsigned long *size)
their = NULL;
if (entry)
their = entry->blob;
- return merge_file(base, our, their, size);
+ return merge_file(entry->path, base, our, their, size);
}
static void *origin(struct merge_list *entry, unsigned long *size)