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>
---
 merge-tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'merge-tree.c')

diff --git a/merge-tree.c b/merge-tree.c
index f18201acdb..f01e7c81ae 100644
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -4,7 +4,7 @@
 #include "blob.h"
 #include "exec_cmd.h"
 
-static const char merge_tree_usage[] = "git-merge-tree <base-tree> <branch1> <branch2>";
+static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>";
 static int resolve_directories = 1;
 
 struct merge_list {
-- 
cgit v1.2.1