X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff-interface.h;h=eaf9cd34981695fc8d12fd35d01ceae93b22254d;hb=917f3e73ec60820608d32016293aa496bdcbdf0e;hp=558492ba38c50351a98f80c16e83a058ace849ab;hpb=c4275591fbb7d582c397b228e38dbb8419c89330;p=git.git

diff --git a/xdiff-interface.h b/xdiff-interface.h
index 558492ba3..eaf9cd349 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -16,6 +16,8 @@ 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;
 
 #endif