X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.h;h=7e1e972b13cb8a9f2fae084f769fffede24c8dbb;hb=5238cbf65638d7a097bdb5ca8226f5acbe31f143;hp=c8135b0ec70cc2eb92e5a6fd9353a134fda6b7bf;hpb=bac9c06ba093d9254cb2ab3eed074722a3e635a6;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index c8135b0ec..7e1e972b1 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -20,6 +20,8 @@ struct merge_options {
 	int diff_rename_limit;
 	int merge_rename_limit;
 	int rename_score;
+	int needed_rename_limit;
+	int show_rename_progress;
 	int call_depth;
 	struct strbuf obuf;
 	struct string_list current_file_set;
@@ -57,6 +59,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