Merge branch 'maint'

diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index 8026ccff4a459a75148740382646f7fe10b00255..e9588eec33ba5b64d186ff048bb040c18c57e6bc 100755 (executable)
--- 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