Merge branch 'jc/better-conflict-resolution'

[git.git] / xdiff-interface.h

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