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:
Alexander Potashev
2009-01-04 21:39:27 +03:00
committed by Junio C Hamano
parent 5c7eee03da
commit 34263de026
10 changed files with 11 additions and 11 deletions

View File

@ -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
};