X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.h;h=c8135b0ec70cc2eb92e5a6fd9353a134fda6b7bf;hb=329351feeb0c08c835ac4ff05f127fbfe42a78cf;hp=37ff99a2981dc618acdd5c7b1197ba20b9a53f4b;hpb=635a7bb1d807390bedfc1147d2052e8423bcd1e0;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index 37ff99a29..c8135b0ec 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -15,18 +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;
 };
 
-/* Return a list of user-friendly error messages to be used by merge */
-struct unpack_trees_error_msgs get_porcelain_error_msgs(void);
-
 /* merge_trees() but with recursive ancestor consolidation */
 int merge_recursive(struct merge_options *o,
 		    struct commit *h1,