Merge branch 'maint-1.6.1' into maint

diff --git a/merge-tree.c b/merge-tree.c
index f18201acdb21f7eb3e09a546382417851b572fd4..f01e7c81aebea84b95154c9076af66979e52715f 100644 (file)
--- 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 {