diff options
Diffstat (limited to 'xdiff-interface.c')
| -rw-r--r-- | xdiff-interface.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index 0460e03f5e..dcbb5e0985 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -307,7 +307,8 @@ int xdiff_compare_lines(const char *l1, long s1, int git_xmerge_style = -1; -int git_xmerge_config(const char *var, const char *value, void *cb) +int git_xmerge_config(const char *var, const char *value, + const struct config_context *ctx, void *cb) { if (!strcmp(var, "merge.conflictstyle")) { if (!value) @@ -327,5 +328,5 @@ int git_xmerge_config(const char *var, const char *value, void *cb) value, var); return 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value, ctx, cb); } |