mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'pt/am-builtin'
Rewrite "am" in "C". * pt/am-builtin: i18n: am: fix typo in description of -b option
This commit is contained in:
commit
74702c3825
|
@ -2191,7 +2191,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
|
|||
OPT_BOOL('i', "interactive", &state.interactive,
|
||||
N_("run interactively")),
|
||||
OPT_HIDDEN_BOOL('b', "binary", &binary,
|
||||
N_("(historical option -- no-op")),
|
||||
N_("historical option -- no-op")),
|
||||
OPT_BOOL('3', "3way", &state.threeway,
|
||||
N_("allow fall back on 3way merging if needed")),
|
||||
OPT__QUIET(&state.quiet, N_("be quiet")),
|
||||
|
|
Loading…
Reference in a new issue