diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2023-05-13 13:42:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-13 13:42:24 +0100 |
| commit | c87a3f8f6c698e62bc95f801755db8c4281bebe7 (patch) | |
| tree | 72edc703c21bde40a3fb3104c66eea408e25fb3c /deps/xdiff/xdiffi.h | |
| parent | 213d35ea6d69598693b7f4b5b737aa98c91ba98e (diff) | |
| parent | 027630ddd42e5ab4f4f5a221f38a3fd5bda4e3d4 (diff) | |
| download | libgit2-c87a3f8f6c698e62bc95f801755db8c4281bebe7.tar.gz | |
Merge pull request #6561 from libgit2/ethomson/xdiff
Update xdiff to git 2.40.1's version
Diffstat (limited to 'deps/xdiff/xdiffi.h')
| -rw-r--r-- | deps/xdiff/xdiffi.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/deps/xdiff/xdiffi.h b/deps/xdiff/xdiffi.h index 8f1c7c8b0..126c9d8ff 100644 --- a/deps/xdiff/xdiffi.h +++ b/deps/xdiff/xdiffi.h @@ -56,9 +56,7 @@ int xdl_build_script(xdfenv_t *xe, xdchange_t **xscr); 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); +int xdl_do_patience_diff(xpparam_t const *xpp, xdfenv_t *env); +int xdl_do_histogram_diff(xpparam_t const *xpp, xdfenv_t *env); #endif /* #if !defined(XDIFFI_H) */ |