diff options
Diffstat (limited to 'xdiff-interface.h')
| -rw-r--r-- | xdiff-interface.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h new file mode 100644 index 0000000000..eff7762ee1 --- /dev/null +++ b/xdiff-interface.h @@ -0,0 +1,24 @@ +#ifndef XDIFF_INTERFACE_H +#define XDIFF_INTERFACE_H + +#include "xdiff/xdiff.h" + +typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long); + +int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb); +int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2, + xdiff_emit_consume_fn fn, void *consume_callback_data, + xpparam_t const *xpp, xdemitconf_t const *xecfg); +int parse_hunk_header(char *line, int len, + int *ob, int *on, + int *nb, int *nn); +int read_mmfile(mmfile_t *ptr, const char *filename); +void read_mmblob(mmfile_t *ptr, const unsigned char *sha1); +int buffer_is_binary(const char *ptr, unsigned long size); + +extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); +extern void xdiff_clear_find_func(xdemitconf_t *xecfg); +extern int git_xmerge_config(const char *var, const char *value, void *cb); +extern int git_xmerge_style; + +#endif |