X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.h;h=7e1e972b13cb8a9f2fae084f769fffede24c8dbb;hb=54f6a8dbd65cbe6ad31a8b6b531de81009514eb3;hp=981ed6ac94b5ed73f15a3b0dca723586374ca0b8;hpb=1a9fe453263137be7d42e6fbfc041b5b2d9521d7;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index 981ed6ac9..7e1e972b1 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -20,6 +20,8 @@ struct merge_options {
 	int diff_rename_limit;
 	int merge_rename_limit;
 	int rename_score;
+	int needed_rename_limit;
+	int show_rename_progress;
 	int call_depth;
 	struct strbuf obuf;
 	struct string_list current_file_set;