undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pt/am-builtin'

Browse Source 
Rewrite "am" in "C".

* pt/am-builtin:
  i18n: am: fix typo in description of -b option
This commit is contained in:
Junio C Hamano 2015-08-26 15:45:33 -07:00
commit 74702c3825
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/am.c
View File

@ -2191,7 +2191,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
OPT_BOOL('i', "interactive", &state.interactive, OPT_BOOL('i', "interactive", &state.interactive,
N_("run interactively")), N_("run interactively")),
OPT_HIDDEN_BOOL('b', "binary", &binary, OPT_HIDDEN_BOOL('b', "binary", &binary,
N_("(historical option -- no-op")), N_("historical option -- no-op")),
OPT_BOOL('3', "3way", &state.threeway, OPT_BOOL('3', "3way", &state.threeway,
N_("allow fall back on 3way merging if needed")), N_("allow fall back on 3way merging if needed")),
OPT__QUIET(&state.quiet, N_("be quiet")), OPT__QUIET(&state.quiet, N_("be quiet")),