Merge branch 'yd/doc-merge-annotated-tag' into maint

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index f612cb847aca981e16cb6006fa08d870497c6263..3373c040d4aae221386fac5ec2cd9a29344c1840 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -18,7 +18,7 @@
 
 USAGE='<orig blob> <our blob> <their blob> <path>'
 USAGE="$USAGE <orig mode> <our mode> <their mode>"
-LONG_USAGE="Usage: git merge-one-file $USAGE
+LONG_USAGE="usage: git merge-one-file $USAGE
 
 Blob ids and modes should be empty for missing files."