X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-tree.c;h=f01e7c81aebea84b95154c9076af66979e52715f;hb=f92f2038a5192ac5fc1bb4f38c49906aa45b3f1e;hp=f18201acdb21f7eb3e09a546382417851b572fd4;hpb=29254142ddac335b33606c0036561f6df89f3d18;p=git.git

diff --git a/merge-tree.c b/merge-tree.c
index f18201acd..f01e7c81a 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 {