X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-tree.c;h=f01e7c81aebea84b95154c9076af66979e52715f;hb=3f74c8e8d8721d093655d7bb00ead078d8324100;hp=f18201acdb21f7eb3e09a546382417851b572fd4;hpb=b37f26d8a2d4551b8ee365e66cbaf3d03b05e74d;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 "; +static const char merge_tree_usage[] = "git merge-tree "; static int resolve_directories = 1; struct merge_list {