Trivial usage string clean-up

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-13 23:30:31 +01:00
parent aa9dc7afd2
commit 806f36d4d7
14 changed files with 39 additions and 89 deletions
--- a/git-merge.sh
+++ b/git-merge.sh
@ -3,15 +3,13 @@
 # Copyright (c) 2005 Junio C Hamano
 #

+
+USAGE='[-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+'
 . git-sh-setup

 LF='
 '

-usage () {
-    die "git-merge [-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+"
-}
-
 all_strategies='recursive octopus resolve stupid ours'
 default_strategies='recursive'
 use_strategies=