Merge branch 'pt/am-builtin'

Rewrite "am" in "C". * pt/am-builtin: i18n: am: fix typo in description of -b option
git-mirror · Aug 26, 2015 · 74702c3 · 74702c3
2 parents b7d2a15 + 1fb5a0e
commit 74702c3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/builtin/am.c b/builtin/am.c
@@ -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")),