summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorAlexander Potashev <aspotashev@gmail.com>2009-01-04 21:39:27 +0300
committerJunio C Hamano <gitster@pobox.com>2009-02-04 15:08:49 -0800
commit34263de0265a484bf44058819a363bb1e627c0ce (patch)
treee33524d34269861730abb1f3386ca90db92d8ab8 /builtin-merge.c
parent5c7eee03da32ac8ff5e91159670558b0d7fb9b1a (diff)
downloadgit-34263de0265a484bf44058819a363bb1e627c0ce.tar.gz
Replace deprecated dashed git commands in usage
Signed-off-by: Alexander Potashev <aspotashev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
-rw-r--r--builtin-merge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-merge.c b/builtin-merge.c
index e4555b0199..885fad9bba 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -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
};