X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=merge-recursive.h;h=981ed6ac94b5ed73f15a3b0dca723586374ca0b8;hb=67ac1e1d57e45899a4dfd900a0249f48507584b5;hp=c8135b0ec70cc2eb92e5a6fd9353a134fda6b7bf;hpb=c835288be4cac722a20f9601a920879206a0ff61;p=thirdparty%2Fgit.git

diff --git a/merge-recursive.h b/merge-recursive.h
index c8135b0ec7..981ed6ac94 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -57,6 +57,8 @@ 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, struct commit_list *common, const char *head_arg, struct commit_list *remotes);
+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