diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-11 21:44:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-11 21:44:20 (GMT) |
| commit | bb831db6774aaa733199360dc7af6f3ce375fc20 (patch) | |
| tree | 4d4befdb8dfc6b9ddafec4550a6e44aaacd89dd9 /builtin/fmt-merge-msg.c | |
| parent | afa3ccbf44cb47cf988c6f40ce3ddb10829a9e7b (diff) | |
| parent | 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b (diff) | |
| download | git-bb831db6774aaa733199360dc7af6f3ce375fc20.zip git-bb831db6774aaa733199360dc7af6f3ce375fc20.tar.gz git-bb831db6774aaa733199360dc7af6f3ce375fc20.tar.bz2 | |
Merge branch 'ah/usage-strings'
* ah/usage-strings:
standardize usage info string format
Diffstat (limited to 'builtin/fmt-merge-msg.c')
| -rw-r--r-- | builtin/fmt-merge-msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index af7919e..1d962dc 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -10,7 +10,7 @@ #include "gpg-interface.h" static const char * const fmt_merge_msg_usage[] = { - N_("git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"), + N_("git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"), NULL }; |