merge-recursive: option to specify rename threshold

[git.git] / merge-recursive.h

diff --git a/merge-recursive.h b/merge-recursive.h
index d21b446a1df8add6f2824c77a8896b9098d5c0fa..54420f15560310cdaf695a0b89133465f2bc52ec 100644 (file)
--- 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;