X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=xdiff-interface.h;h=33cab9dd59336fabe8cdd484953544b505c1ba94;hb=a013585b20ac757b0e75a72181ffa44674f35235;hp=536f4e4d9784e0e5ffdc108a5be4bf758d1578ba;hpb=610f043bb378d12f399f4e5692fb874e0a043b23;p=git.git diff --git a/xdiff-interface.h b/xdiff-interface.h index 536f4e4d9..33cab9dd5 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -13,6 +13,7 @@ struct xdiff_emit_state { unsigned long remainder_size; }; +int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb); int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf); int parse_hunk_header(char *line, int len, int *ob, int *on, @@ -20,4 +21,6 @@ int parse_hunk_header(char *line, int len, int read_mmfile(mmfile_t *ptr, const char *filename); int buffer_is_binary(const char *ptr, unsigned long size); +extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); + #endif