X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.h;h=c8135b0ec70cc2eb92e5a6fd9353a134fda6b7bf;hb=a5066a0b07deb76327e3e3ea845afc899e256c51;hp=34492dbd6ea22d715c98acbeeabe04033ff9a794;hpb=9f6774ed86a9ac22142c0b37e26e67eb1d032962;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index 34492dbd6..c8135b0ec 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -15,9 +15,11 @@ struct merge_options {
 	const char *subtree_shift;
 	unsigned buffer_output : 1;
 	unsigned renormalize : 1;
+	long xdl_opts;
 	int verbosity;
 	int diff_rename_limit;
 	int merge_rename_limit;
+	int rename_score;
 	int call_depth;
 	struct strbuf obuf;
 	struct string_list current_file_set;
@@ -52,6 +54,8 @@ int merge_recursive_generic(struct merge_options *o,
 void init_merge_options(struct merge_options *o);
 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);