pre-commit hook: complain about conflict markers.
[git] / xdiff-interface.h
1 #ifndef XDIFF_INTERFACE_H
2 #define XDIFF_INTERFACE_H
3
4 #include "xdiff/xdiff.h"
5
6 struct xdiff_emit_state;
7
8 typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
9
10 struct xdiff_emit_state {
11         xdiff_emit_consume_fn consume;
12         char *remainder;
13         unsigned long remainder_size;
14 };
15
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
21 #endif