Merge branch 'jc/diff-algo-cleanup' into maint

diff --git a/diff.c b/diff.c
index fc3cc73d9ea79b5b05a0e055e3d6dbfa0ad2c501..7da16c9590805dc687d7dc67acac2cb104144036 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3544,9 +3544,9 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
        else if (!strcmp(arg, "--ignore-space-at-eol"))
                DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
        else if (!strcmp(arg, "--patience"))
-               DIFF_XDL_SET(options, PATIENCE_DIFF);
+               options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
        else if (!strcmp(arg, "--histogram"))
-               DIFF_XDL_SET(options, HISTOGRAM_DIFF);
+               options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF);
 
        /* flags options */
        else if (!strcmp(arg, "--binary")) {