Merge branch 'rs/i18n-cannot-be-used-together' into maint-2.43

[thirdparty/git.git] / parse-options.c

diff --git a/parse-options.c b/parse-options.c
index d50962062ead7dfb4d831199a5dca2e0b4316227..65fab5bb9dca071fac111705f6cbfc439eeef447 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -279,7 +279,8 @@ static enum parse_opt_result get_value(struct parse_opt_ctx_t *p,
 
        opt_name = optnamearg(opt, arg, flags);
        other_opt_name = optnamearg(elem->opt, elem->arg, elem->flags);
-       error(_("%s is incompatible with %s"), opt_name, other_opt_name);
+       error(_("options '%s' and '%s' cannot be used together"),
+             opt_name, other_opt_name);
        free(opt_name);
        free(other_opt_name);
        return -1;