Skip to content

Commit

Permalink
git-merge-one-file: use a lowercase "usage:" string
Browse files Browse the repository at this point in the history 
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
David Aguilar authored and Junio C Hamano committed Feb 24, 2013
1 parent 8d8bbc3 commit e5a1518
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-merge-one-file.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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."

Expand Down

0 comments on commit e5a1518

Please sign in to comment.