X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=merge-recursive.h;h=9e090a347016ea715acf8d26ec5527f033b94ba1;hb=c0179c0d33b0fc3c8ad30246eece220e0442fb6e;hp=58f3435e9e854ab82c2fd0c10c55520bc69e5ed0;hpb=5000caa3069e8627abfaff49c65a7daeb81c17fa;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index 58f3435e9..9e090a347 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -59,9 +59,4 @@ struct tree *write_tree_from_memory(struct merge_options *o);
 
 int parse_merge_opt(struct merge_options *out, const char *s);
 
-/* builtin/merge.c */
-int try_merge_command(const char *strategy, size_t xopts_nr,
-		const char **xopts, struct commit_list *common,
-		const char *head_arg, struct commit_list *remotes);
-
 #endif