checkout: do not mention detach advice for explicit --detach option
[git/raj.git] / xdiff-interface.h
blobfbb5a1c3949b6ef6ba0dfb758723a48f3b402190
1 #ifndef XDIFF_INTERFACE_H
2 #define XDIFF_INTERFACE_H
4 #include "xdiff/xdiff.h"
6 /*
7 * xdiff isn't equipped to handle content over a gigabyte;
8 * we make the cutoff 1GB - 1MB to give some breathing
9 * room for constant-sized additions (e.g., merge markers)
11 #define MAX_XDIFF_SIZE (1024UL * 1024 * 1023)
13 typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
15 int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
16 int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
17 xdiff_emit_consume_fn fn, void *consume_callback_data,
18 xpparam_t const *xpp, xdemitconf_t const *xecfg);
19 int parse_hunk_header(char *line, int len,
20 int *ob, int *on,
21 int *nb, int *nn);
22 int read_mmfile(mmfile_t *ptr, const char *filename);
23 void read_mmblob(mmfile_t *ptr, const unsigned char *sha1);
24 int buffer_is_binary(const char *ptr, unsigned long size);
26 extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
27 extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
28 extern int git_xmerge_config(const char *var, const char *value, void *cb);
29 extern int git_xmerge_style;
31 #endif