X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff-interface.h;fp=xdiff-interface.h;h=eaf9cd34981695fc8d12fd35d01ceae93b22254d;hb=9800c0df412869c7949935b61581b9361fc49bd1;hp=b3b5c933bfc3aac2d6c0b59aa72bb18e0b1f7557;hpb=9ba929ed652f5ed7707f1c684999af4ad02c4925;p=git.git diff --git a/xdiff-interface.h b/xdiff-interface.h index b3b5c933b..eaf9cd349 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -16,7 +16,7 @@ int parse_hunk_header(char *line, int len, int read_mmfile(mmfile_t *ptr, const char *filename); int buffer_is_binary(const char *ptr, unsigned long size); -extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line); +extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); extern int git_xmerge_config(const char *var, const char *value, void *cb); extern int git_xmerge_style;