X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff-interface.h;fp=xdiff-interface.h;h=b3b5c933bfc3aac2d6c0b59aa72bb18e0b1f7557;hb=9ba929ed652f5ed7707f1c684999af4ad02c4925;hp=558492ba38c50351a98f80c16e83a058ace849ab;hpb=c11c7a5db3676258512c4067c5279377811d3ab8;p=git.git

diff --git a/xdiff-interface.h b/xdiff-interface.h
index 558492ba3..b3b5c933b 100644
--- 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);
+extern int git_xmerge_config(const char *var, const char *value, void *cb);
+extern int git_xmerge_style;
 
 #endif