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

diff --git a/merge-recursive.h b/merge-recursive.h
index 2eb5d1aad..c8135b0ec 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -19,6 +19,7 @@ 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;