diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:25 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:25 +0900 |
| commit | fa5799cd348f465c13b1514f4cc4258db251bd02 (patch) | |
| tree | ed4614c836c17fbfac385ee48441e46c87fe3fa2 | |
| parent | Merge branch 'hy/doc-show-is-like-log-not-diff-tree' into maint-2.42 (diff) | |
| parent | am: fix error message in parse_opt_show_current_patch() (diff) | |
| download | git-fa5799cd348f465c13b1514f4cc4258db251bd02.tar.gz git-fa5799cd348f465c13b1514f4cc4258db251bd02.zip | |
Merge branch 'ob/am-msgfix' into maint-2.42
The parameters to generate an error message have been corrected.
* ob/am-msgfix:
am: fix error message in parse_opt_show_current_patch()
| -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 202040b62e..6655059a57 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; |