diff -r 09f320067591 -r b5bb0f99064d mercurial/thirdparty/xdiff/xdiffi.h --- a/mercurial/thirdparty/xdiff/xdiffi.h Sun Mar 04 00:07:04 2018 -0800 +++ b/mercurial/thirdparty/xdiff/xdiffi.h Sun Mar 04 00:17:49 2018 -0800 @@ -56,9 +56,5 @@ void xdl_free_script(xdchange_t *xscr); int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, xdemitconf_t const *xecfg); -int xdl_do_patience_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, - xdfenv_t *env); -int xdl_do_histogram_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, - xdfenv_t *env); #endif /* #if !defined(XDIFFI_H) */