mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
David Aguilar
2013-02-23 16:50:12 -08:00
committed by Junio C Hamano
parent 8d8bbc3644
commit e5a1518ef4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge-one-file.sh
View File

@ -18,7 +18,7 @@
USAGE='<orig blob> <our blob> <their blob> <path>' USAGE='<orig blob> <our blob> <their blob> <path>'
USAGE="$USAGE <orig mode> <our mode> <their mode>" 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." Blob ids and modes should be empty for missing files."