mirror of
https://github.com/git/git
synced 2024-10-01 06:05:20 +00:00
Merge branch 'ob/am-msgfix'
The parameters to generate an error message have been corrected. * ob/am-msgfix: am: fix error message in parse_opt_show_current_patch()
This commit is contained in:
commit
a03cc4ba1d
|
@ -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