diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:51:14 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:51:15 -0700 |
commit | 86c340e08287c0faad8871207787e5819f22a7d5 (patch) | |
tree | ee05a1f8d8fdf038e385de68ecc107793c123eb5 /xdiff/xhistogram.c | |
parent | 9eefd8ae8a955f470d931c13b8711d98f4e9d56e (diff) | |
parent | 307ab20b333d9b4c818b1ff912e86944d1a3fdc1 (diff) | |
download | git-86c340e08287c0faad8871207787e5819f22a7d5.tar.gz |
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 'xdiff/xhistogram.c')
-rw-r--r-- | xdiff/xhistogram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c index 18f6f997c3..bf99787c3e 100644 --- a/xdiff/xhistogram.c +++ b/xdiff/xhistogram.c @@ -252,7 +252,7 @@ static int fall_back_to_classic_diff(struct histindex *index, int line1, int count1, int line2, int count2) { xpparam_t xpp; - xpp.flags = index->xpp->flags & ~XDF_HISTOGRAM_DIFF; + xpp.flags = index->xpp->flags & ~XDF_DIFF_ALGORITHM_MASK; return xdl_fall_back_diff(index->env, &xpp, line1, count1, line2, count2); |