X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fexamples%2Fgit-merge.sh;h=e9588eec33ba5b64d186ff048bb040c18c57e6bc;hb=4d9e42f8f11c57b32b976a943c8ddaf6214e64b8;hp=8026ccff4a459a75148740382646f7fe10b00255;hpb=88bbda08d7b9503862a8fb8846d78c67825e5e3d;p=git.git

diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index 8026ccff4..e9588eec3 100755
--- a/contrib/examples/git-merge.sh
+++ b/contrib/examples/git-merge.sh
@@ -5,8 +5,8 @@
 
 OPTIONS_KEEPDASHDASH=
 OPTIONS_SPEC="\
-git-merge [options] <remote>...
-git-merge [options] <msg> HEAD <remote>
+git merge [options] <remote>...
+git merge [options] <msg> HEAD <remote>
 --
 stat                 show a diffstat at the end of the merge
 n                    don't show a diffstat at the end of the merge