diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-11 11:19:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-11 11:19:27 -0700 |
| commit | 8daff716ad6caee55e04e5550137cd3bd83b9822 (patch) | |
| tree | c265e6d3c6a05ce2f72b6058958f4fac14d79731 /diff.c | |
| parent | Merge branch 'ct/advise-push-default' into maint (diff) | |
| parent | xdiff: PATIENCE/HISTOGRAM are not independent option bits (diff) | |
| download | tgif-8daff716ad6caee55e04e5550137cd3bd83b9822.tar.xz | |
Merge branch 'jc/diff-algo-cleanup' into maint
* jc/diff-algo-cleanup:
xdiff: PATIENCE/HISTOGRAM are not independent option bits
xdiff: remove XDL_PATCH_* macros
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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")) { |