From 12909b6b8a4a51e9d2b46610be4f93c782949c80 Mon Sep 17 00:00:00 2001 From: Jean-Noël Avila Date: Wed, 5 Jan 2022 20:02:16 +0000 Subject: i18n: turn "options are incompatible" into "cannot be used together" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-Noël Avila Reviewed-by: Johannes Sixt Signed-off-by: Junio C Hamano --- builtin/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin/branch.c') diff --git a/builtin/branch.c b/builtin/branch.c index 6c8b0fcc11..0e93865371 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -722,7 +722,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) finalize_colopts(&colopts, -1); if (filter.verbose) { if (explicitly_enable_column(colopts)) - die(_("--column and --verbose are incompatible")); + die(_("options '%s' and '%s' cannot be used together"), "--column", "--verbose"); colopts = 0; } -- cgit 1.2.3-korg