From 34263de0265a484bf44058819a363bb1e627c0ce Mon Sep 17 00:00:00 2001
From: Alexander Potashev <aspotashev@gmail.com>
Date: Sun, 4 Jan 2009 21:39:27 +0300
Subject: Replace deprecated dashed git commands in usage

Signed-off-by: Alexander Potashev <aspotashev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin-merge.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'builtin-merge.c')

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
 };
 
-- 
cgit v1.2.1