Merge commit 'refs/top-bases/girocco' into girocco
[git/repo.git] / xdiff-interface.h
blobeaf9cd34981695fc8d12fd35d01ceae93b22254d
1 #ifndef XDIFF_INTERFACE_H
2 #define XDIFF_INTERFACE_H
4 #include "xdiff/xdiff.h"
6 typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
8 int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
9 int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
10 xdiff_emit_consume_fn fn, void *consume_callback_data,
11 xpparam_t const *xpp,
12 xdemitconf_t const *xecfg, xdemitcb_t *xecb);
13 int parse_hunk_header(char *line, int len,
14 int *ob, int *on,
15 int *nb, int *nn);
16 int read_mmfile(mmfile_t *ptr, const char *filename);
17 int buffer_is_binary(const char *ptr, unsigned long size);
19 extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
20 extern int git_xmerge_config(const char *var, const char *value, void *cb);
21 extern int git_xmerge_style;
23 #endif