refactor userdiff textconv code

[git.git] / xdiff-interface.h

diff --git a/xdiff-interface.h b/xdiff-interface.h
index 23c49b99d1208d48bb19a3fb499b5f356b25ee7e..eaf9cd34981695fc8d12fd35d01ceae93b22254d 100644 (file)
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -17,5 +17,7 @@ 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, int cflags);
+extern int git_xmerge_config(const char *var, const char *value, void *cb);
+extern int git_xmerge_style;
 
 #endif