Merge branch 'nd/i18n-2.8.0'

diff --git a/merge-recursive.c b/merge-recursive.c
index 7bff5be164ef0c853818754d8e1882aac23ac6b1..b880ae50e7ee4f8e88bda83618529ea30462e4ef 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2094,8 +2094,10 @@ int parse_merge_opt(struct merge_options *o, const char *s)
                o->renormalize = 0;
        else if (!strcmp(s, "no-renames"))
                o->detect_rename = 0;
-       else if (!strcmp(s, "find-renames"))
+       else if (!strcmp(s, "find-renames")) {
                o->detect_rename = 1;
+               o->rename_score = 0;
+       }
        else if (skip_prefix(s, "find-renames=", &arg) ||
                 skip_prefix(s, "rename-threshold=", &arg)) {
                if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)