Browse Source

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>
maint
David Aguilar 12 years ago committed by Junio C Hamano
parent
commit
e5a1518ef4
  1. 2
      git-merge-one-file.sh

2
git-merge-one-file.sh

@ -18,7 +18,7 @@ @@ -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."


Loading…
Cancel
Save