summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorAlexander Potashev <aspotashev@gmail.com>2009-01-04 18:39:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-04 23:08:49 (GMT)
commit34263de0265a484bf44058819a363bb1e627c0ce (patch)
treee33524d34269861730abb1f3386ca90db92d8ab8 /merge-tree.c
parent5c7eee03da32ac8ff5e91159670558b0d7fb9b1a (diff)
downloadgit-34263de0265a484bf44058819a363bb1e627c0ce.zip
git-34263de0265a484bf44058819a363bb1e627c0ce.tar.gz
git-34263de0265a484bf44058819a363bb1e627c0ce.tar.bz2
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 'merge-tree.c')
-rw-r--r--merge-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-tree.c b/merge-tree.c
index f18201a..f01e7c8 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 {