Merge branch 'jk/asciidoc-markup-fix' into maint

diff --git a/builtin/merge.c b/builtin/merge.c
index c638fd5a9a8165c58d46d4edeeb0f3bbe8c0f9a1..3b0f8f96d4168463139d15f1cde655facc73426c 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -42,8 +42,8 @@ struct strategy {
 };
 
 static const char * const builtin_merge_usage[] = {
-       N_("git merge [options] [<commit>...]"),
-       N_("git merge [options] <msg> HEAD <commit>"),
+       N_("git merge [<options>] [<commit>...]"),
+       N_("git merge [<options>] <msg> HEAD <commit>"),
        N_("git merge --abort"),
        NULL
 };