diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2023-09-21 13:07:27 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-21 12:09:33 -0700 |
| commit | 43abaaf0087c72fccc5bbf3fc103eb148465480d (patch) | |
| tree | cb1971d17ae165af70730604e896d1bec3af2ef7 /builtin/am.c | |
| parent | Git 2.42 (diff) | |
| download | git-43abaaf0087c72fccc5bbf3fc103eb148465480d.tar.gz git-43abaaf0087c72fccc5bbf3fc103eb148465480d.zip | |
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>
Diffstat (limited to 'builtin/am.c')
| -rw-r--r-- | builtin/am.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index 8bde034fae..37d7c7c6f3 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -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; |