summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
Diffstat (limited to 'xdiff-interface.h')
-rw-r--r--xdiff-interface.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h
index f7f791d96b..cfe3215cb2 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -22,5 +22,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