Replace deprecated dashed git commands in usage
Signed-off-by: Alexander Potashev <aspotashev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
5c7eee03da
commit
34263de026
@ -36,8 +36,8 @@ struct strategy {
|
||||
};
|
||||
|
||||
static const char * const builtin_merge_usage[] = {
|
||||
"git-merge [options] <remote>...",
|
||||
"git-merge [options] <msg> HEAD <remote>",
|
||||
"git merge [options] <remote>...",
|
||||
"git merge [options] <msg> HEAD <remote>",
|
||||
NULL
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user