mergetool: Fix typo in options passed to kdiff3
[git/mergetool.git] / xdiff-interface.h
blobfb742dbb6ba2125b970b9d9510e208ec99954a2d
1 #ifndef XDIFF_INTERFACE_H
2 #define XDIFF_INTERFACE_H
4 #include "xdiff/xdiff.h"
6 struct xdiff_emit_state;
8 typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
10 struct xdiff_emit_state {
11 xdiff_emit_consume_fn consume;
12 char *remainder;
13 unsigned long remainder_size;
16 int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
17 int parse_hunk_header(char *line, int len,
18 int *ob, int *on,
19 int *nb, int *nn);
20 int read_mmfile(mmfile_t *ptr, const char *filename);
21 int buffer_is_binary(const char *ptr, unsigned long size);
23 extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line);
25 #endif