Skip to content

Commit

Permalink
i18n: am: fix typo in description of -b option
Browse files Browse the repository at this point in the history
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jiang Xin authored and Junio C Hamano committed Aug 26, 2015
1 parent e97a5e7 commit 1fb5a0e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion builtin/am.c
Original file line number Diff line number Diff line change
Expand Up @@ -2143,7 +2143,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")),
Expand Down

0 comments on commit 1fb5a0e

Please sign in to comment.