Merge branch 'jc/combine' into next
[git.git] / xdiff-interface.h
blobec682a297108dc0a58203019693c1a1c4b0a91e1
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 unsigned int *ob, unsigned int *on,
19 unsigned int *nb, unsigned int *nn);
21 #endif