X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fmerge-tree.c;h=897a563bc6662e108c29656d633b7400384154f9;hb=fee6bc5f031a9d18d09463d96d7df562d62438f7;hp=19917426fba19cf60b838ff9b07d20b5e44259a5;hpb=d9ac3e41c37ea565d8227d942b4f468616c9813a;p=git.git

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 19917426f..897a563bc 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -3,6 +3,7 @@
 #include "xdiff-interface.h"
 #include "blob.h"
 #include "exec_cmd.h"
+#include "merge-file.h"
 
 static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>";
 static int resolve_directories = 1;
@@ -54,8 +55,6 @@ static const char *explanation(struct merge_list *entry)
 	return "removed in remote";
 }
 
-extern void *merge_file(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);
-
 static void *result(struct merge_list *entry, unsigned long *size)
 {
 	enum object_type type;