diff --git a/merge-recursive.h b/merge-recursive.h
index f0e056652f47e3e31d2d084f98b6a6b9751ad22c..7e1e972b13cb8a9f2fae084f769fffede24c8dbb 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
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;
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