diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-16 07:51:14 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-16 07:51:15 +0200 |
| commit | 86c340e08287c0faad8871207787e5819f22a7d5 (patch) | |
| tree | ee05a1f8d8fdf038e385de68ecc107793c123eb5 /diff.c | |
| parent | Merge branch 'jc/commit-hook-authorship' (diff) | |
| parent | xdiff: PATIENCE/HISTOGRAM are not independent option bits (diff) | |
| download | git-86c340e08287c0faad8871207787e5819f22a7d5.tar.xz git-86c340e08287c0faad8871207787e5819f22a7d5.zip | |
Merge branch 'jc/diff-algo-cleanup'
Resurrects the preparatory clean-up patches from another topic that was
discarded, as this would give a saner foundation to build on diff.algo
configuration option series.
* 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
@@ -3525,9 +3525,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")) { |