diff options
Diffstat (limited to 'xdiff-interface.c')
| -rw-r--r-- | xdiff-interface.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index 0460e03f5e..d788689d01 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -1,7 +1,9 @@ #include "git-compat-util.h" +#include "gettext.h" #include "config.h" #include "hex.h" -#include "object-store.h" +#include "object-store-ll.h" +#include "strbuf.h" #include "xdiff-interface.h" #include "xdiff/xtypes.h" #include "xdiff/xdiffi.h" @@ -307,11 +309,12 @@ 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) - die("'%s' is not a boolean", var); + return config_error_nonbool(var); if (!strcmp(value, "diff3")) git_xmerge_style = XDL_MERGE_DIFF3; else if (!strcmp(value, "zdiff3")) @@ -323,9 +326,9 @@ int git_xmerge_config(const char *var, const char *value, void *cb) * git-completion.bash when you add new merge config */ else - die("unknown style '%s' given for '%s'", - value, var); + return error(_("unknown style '%s' given for '%s'"), + value, var); return 0; } - return git_default_config(var, value, cb); + return git_default_config(var, value, ctx, cb); } |