From 246cac85055f513626159e8cd20b741eaf5f9f97 Mon Sep 17 00:00:00 2001 From: Jean-Noël Avila Date: Wed, 5 Jan 2022 20:02:24 +0000 Subject: i18n: turn even more messages into "cannot be used together" ones MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Even if some of these messages are not subject to gettext i18n, this helps bring a single style of message for a given error type. Signed-off-by: Jean-Noël Avila Reviewed-by: Johannes Sixt Signed-off-by: Junio C Hamano --- builtin/am.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'builtin/am.c') diff --git a/builtin/am.c b/builtin/am.c index 8677ea2348..68a190dd9f 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2230,9 +2230,9 @@ static int parse_opt_show_current_patch(const struct option *opt, const char *ar } if (resume->mode == RESUME_SHOW_PATCH && new_value != resume->sub_mode) - return error(_("--show-current-patch=%s is incompatible with " - "--show-current-patch=%s"), - arg, valid_modes[resume->sub_mode]); + return error(_("options '%s=%s' and '%s=%s' " + "cannot be used together"), + "--show-current-patch", "--show-current-patch", arg, valid_modes[resume->sub_mode]); resume->mode = RESUME_SHOW_PATCH; resume->sub_mode = new_value; -- cgit v1.3