mirror of
https://github.com/git/git
synced 2024-10-06 00:29:28 +00:00
am: fix error message in parse_opt_show_current_patch()
The argument order was incorrect. This was introduced by 246cac8505
(i18n: turn even more messages into "cannot be used together" ones,
2022-01-05).
Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
43c8a30d15
commit
43abaaf008
|
@ -2303,7 +2303,8 @@ 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(_("options '%s=%s' and '%s=%s' "
|
||||
"cannot be used together"),
|
||||
"--show-current-patch", "--show-current-patch", arg, valid_modes[resume->sub_mode]);
|
||||
"--show-current-patch", arg,
|
||||
"--show-current-patch", valid_modes[resume->sub_mode]);
|
||||
|
||||
resume->mode = RESUME_SHOW_PATCH;
|
||||
resume->sub_mode = new_value;
|
||||
|
|
Loading…
Reference in a new issue