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 /xdiff/xdiffi.c | |
| parent | 07e74b0da2896ffa6acb5c33f56d7266b35b7ac9 (diff) | |
| parent | 307ab20b333d9b4c818b1ff912e86944d1a3fdc1 (diff) | |
| download | git-8daff716ad6caee55e04e5550137cd3bd83b9822.tar.gz git-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 'xdiff/xdiffi.c')
| -rw-r--r-- | xdiff/xdiffi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c index 75a392275..bc889e878 100644 --- a/xdiff/xdiffi.c +++ b/xdiff/xdiffi.c @@ -328,10 +328,10 @@ int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdalgoenv_t xenv; diffdata_t dd1, dd2; - if (xpp->flags & XDF_PATIENCE_DIFF) + if (XDF_DIFF_ALG(xpp->flags) == XDF_PATIENCE_DIFF) return xdl_do_patience_diff(mf1, mf2, xpp, xe); - if (xpp->flags & XDF_HISTOGRAM_DIFF) + if (XDF_DIFF_ALG(xpp->flags) == XDF_HISTOGRAM_DIFF) return xdl_do_histogram_diff(mf1, mf2, xpp, xe); if (xdl_prepare_env(mf1, mf2, xpp, xe) < 0) { |