Start the 2.46 cycle

[thirdparty/git.git] / xdiff-interface.h

diff --git a/xdiff-interface.h b/xdiff-interface.h
index e6f80df04627ccfe1b3777fe380ef3aa5188769e..38537169b729528daffb42dc33a2be9cd62b7b7c 100644 (file)
--- 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;