X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.h;h=c8135b0ec70cc2eb92e5a6fd9353a134fda6b7bf;hb=5c28a8b054cb69a37638b0261fc370422c8fab58;hp=196f0531062a095d57afc92c16c57a67ec93f31c;hpb=9502751181df4a1347b3bd0fe2f0f0cde9cfaa91;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index 196f05310..c8135b0ec 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -15,21 +15,17 @@ 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;
 	struct string_list current_directory_set;
 };
 
-/*
- * Sets the list of user-friendly error messages to be used by the
- * command "cmd" (either merge or checkout)
- */
-void set_porcelain_error_msgs(const char **msgs, const char *cmd);
-
 /* merge_trees() but with recursive ancestor consolidation */
 int merge_recursive(struct merge_options *o,
 		    struct commit *h1,
@@ -58,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);