changeset 36672 | 9e7b14caf67f |
parent 36671 | 34e2ff1f9cd8 |
child 36673 | b3c9c483cac9 |
--- a/mercurial/thirdparty/xdiff/xdiffi.c Sat Mar 03 10:39:43 2018 -0800 +++ b/mercurial/thirdparty/xdiff/xdiffi.c Sat Mar 03 10:39:55 2018 -0800 @@ -328,12 +328,6 @@ xdalgoenv_t xenv; diffdata_t dd1, dd2; - if (XDF_DIFF_ALG(xpp->flags) == XDF_PATIENCE_DIFF) - return xdl_do_patience_diff(mf1, mf2, xpp, xe); - - 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) { return -1;