Make the usage string consistent with Git.

Reviewed-by: Jonathan Nieder <>
Signed-off-by: David Aguilar <>
--- | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ b/
index f612cb8..3373c04 100755
--- a/
+++ b/
@@ -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."

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to