index-pack: fix trivial typo in usage string
[git/git.git] / xdiff-interface.h
CommitLineData
d9ea73e0
JH
1#ifndef XDIFF_INTERFACE_H
2#define XDIFF_INTERFACE_H
3
4#include "xdiff/xdiff.h"
d9ea73e0
JH
5
6typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
86295bb6 7typedef void (*xdiff_emit_hunk_consume_fn)(void *, long, long, long);
d9ea73e0 8
c279d7e9 9int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
c99db9d2 10int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
8a3f524b
JH
11 xdiff_emit_consume_fn fn, void *consume_callback_data,
12 xpparam_t const *xpp,
c99db9d2 13 xdemitconf_t const *xecfg, xdemitcb_t *xecb);
86295bb6
RS
14int xdi_diff_hunks(mmfile_t *mf1, mmfile_t *mf2,
15 xdiff_emit_hunk_consume_fn fn, void *consume_callback_data,
16 xpparam_t const *xpp, xdemitconf_t *xecfg);
c1e335a4 17int parse_hunk_header(char *line, int len,
a0fd3146
JH
18 int *ob, int *on,
19 int *nb, int *nn);
7cab5883 20int read_mmfile(mmfile_t *ptr, const char *filename);
6bfce93e 21int buffer_is_binary(const char *ptr, unsigned long size);
d9ea73e0 22
a013585b 23extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
8cfe5f1c 24extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
b5412484
JH
25extern int git_xmerge_config(const char *var, const char *value, void *cb);
26extern int git_xmerge_style;
f258475a 27
d9ea73e0 28#endif