Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

git-merge-one-file: use a lowercase "usage:" string

Make the usage string consistent with Git.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
commit e5a1518ef40aea657aec64c1507553bde6fac105 1 parent 8d8bbc3
@davvid davvid authored committed
Showing with 1 addition and 1 deletion.
  1. +1 −1  git-merge-one-file.sh
View
2  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."
Please sign in to comment.
Something went wrong with that request. Please try again.