merge-recursive: fix parsing of "diff-algorithm" option

diff --git a/merge-recursive.c b/merge-recursive.c
index ea9dbd307c60a16f290b44964c386e566b6bc7e3..1cd511ba42261cc91b97b2897f8768fa4d76b622 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2068,8 +2068,8 @@ int parse_merge_opt(struct merge_options *o, const char *s)
                o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
        else if (!strcmp(s, "histogram"))
                o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
-       else if (!strcmp(s, "diff-algorithm=")) {
-               long value = parse_algorithm_value(s+15);
+       else if (!prefixcmp(s, "diff-algorithm=")) {
+               long value = parse_algorithm_value(s + strlen("diff-algorithm="));
                if (value < 0)
                        return -1;
                /* clear out previous settings */