X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=blobdiff_plain;f=xdiff-interface.h;h=ede4246bbd3397086f90217539a2d07a35a4b986;hp=e6f80df04627ccfe1b3777fe380ef3aa5188769e;hb=HEAD;hpb=566471105c113e9c9d593a45b604ea8fd03a4484

diff --git a/xdiff-interface.h b/xdiff-interface.h
index e6f80df046..38537169b7 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -51,6 +51,7 @@ int buffer_is_binary(const char *ptr, unsigned long size);
 void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
 void xdiff_clear_find_func(xdemitconf_t *xecfg);
 struct config_context;
+int parse_conflict_style_name(const char *value);
 int git_xmerge_config(const char *var, const char *value,
 		      const struct config_context *ctx, void *cb);
 extern int git_xmerge_style;