From: David Aguilar <davvid@gmail.com>
Date: Sun, 24 Feb 2013 00:50:12 +0000 (-0800)
Subject: git-merge-one-file: use a lowercase "usage:" string
X-Git-Tag: v1.8.2.1~24^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5a1518ef40aea657aec64c1507553bde6fac105;p=git

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>
---

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index f612cb847a..3373c040d4 100755
--- 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."