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 /merge-recursive.c | |
| parent | 07e74b0da2896ffa6acb5c33f56d7266b35b7ac9 (diff) | |
| parent | 307ab20b333d9b4c818b1ff912e86944d1a3fdc1 (diff) | |
| download | git-8daff716ad6caee55e04e5550137cd3bd83b9822.tar.gz | |
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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 0fb174359a..680937c39e 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2069,9 +2069,9 @@ int parse_merge_opt(struct merge_options *o, const char *s) else if (!prefixcmp(s, "subtree=")) o->subtree_shift = s + strlen("subtree="); else if (!strcmp(s, "patience")) - o->xdl_opts |= XDF_PATIENCE_DIFF; + o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF); else if (!strcmp(s, "histogram")) - o->xdl_opts |= XDF_HISTOGRAM_DIFF; + o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF); else if (!strcmp(s, "ignore-space-change")) o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE; else if (!strcmp(s, "ignore-all-space")) |