X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.h;h=c8135b0ec70cc2eb92e5a6fd9353a134fda6b7bf;hb=2844923d62a4c408bd59ddb2caacca4aa7eb86bc;hp=d21b446a1df8add6f2824c77a8896b9098d5c0fa;hpb=58a1ece478c6038a7eb0b6e494d563bd5e6d5978;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index d21b446a1..c8135b0ec 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -19,15 +19,13 @@ struct merge_options {
 	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,