diff options
Diffstat (limited to 'xdiff-interface.h')
-rw-r--r-- | xdiff-interface.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h index 4301a7eef2..e6f80df046 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -1,7 +1,7 @@ #ifndef XDIFF_INTERFACE_H #define XDIFF_INTERFACE_H -#include "cache.h" +#include "hash-ll.h" #include "xdiff/xdiff.h" /* @@ -50,7 +50,9 @@ 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); -int git_xmerge_config(const char *var, const char *value, void *cb); +struct config_context; +int git_xmerge_config(const char *var, const char *value, + const struct config_context *ctx, void *cb); extern int git_xmerge_style; /* |