diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-18 00:36:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-18 00:36:06 (GMT) |
| commit | ca01600306863ecfa8bbef769b8e1386cb149785 (patch) | |
| tree | 30507da396d4a19240aed15c47a2f4356dd3987d /merge-recursive.c | |
| parent | 2f5cb6aa1e2eb7b12df85d5ddc4d8bc79be47b3d (diff) | |
| parent | 6486a84cb8e69ddf03b2139db3d968400e05f5b3 (diff) | |
| download | git-ca01600306863ecfa8bbef769b8e1386cb149785.zip git-ca01600306863ecfa8bbef769b8e1386cb149785.tar.gz git-ca01600306863ecfa8bbef769b8e1386cb149785.tar.bz2 | |
Merge branch 'rc/histogram-diff'
* rc/histogram-diff:
xdiff/xhistogram: drop need for additional variable
xdiff/xhistogram: rely on xdl_trim_ends()
xdiff/xhistogram: rework handling of recursed results
xdiff: do away with xdl_mmfile_next()
Make test number unique
xdiff/xprepare: use a smaller sample size for histogram diff
xdiff/xprepare: skip classification
teach --histogram to diff
t4033-diff-patience: factor out tests
xdiff/xpatience: factor out fall-back-diff function
xdiff/xprepare: refactor abort cleanups
xdiff/xprepare: use memset()
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index db9ba19..0cc1e6f 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1759,6 +1759,8 @@ int parse_merge_opt(struct merge_options *o, const char *s) o->subtree_shift = s + strlen("subtree="); else if (!strcmp(s, "patience")) o->xdl_opts |= XDF_PATIENCE_DIFF; + else if (!strcmp(s, "histogram")) + o->xdl_opts |= XDF_HISTOGRAM_DIFF; else if (!strcmp(s, "ignore-space-change")) o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE; else if (!strcmp(s, "ignore-all-space")) |