diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:44:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:44:20 -0800 |
| commit | bb831db6774aaa733199360dc7af6f3ce375fc20 (patch) | |
| tree | 4d4befdb8dfc6b9ddafec4550a6e44aaacd89dd9 /builtin/merge.c | |
| parent | afa3ccbf44cb47cf988c6f40ce3ddb10829a9e7b (diff) | |
| parent | 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b (diff) | |
| download | git-bb831db6774aaa733199360dc7af6f3ce375fc20.tar.gz | |
Merge branch 'ah/usage-strings'
* ah/usage-strings:
standardize usage info string format
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index c638fd5a9a..3b0f8f96d4 100644 --- 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 }; |