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-resolve.sh
+++ b/git-resolve.sh
@ -4,11 +4,9 @@
 #
 # Resolve two trees.
 #
-. git-sh-setup

-usage () {
-	die "git-resolve <head> <remote> <merge-message>"
-}
+USAGE='<head> <remote> <merge-message>'
+. git-sh-setup

 dropheads() {
 	rm -f -- "$GIT_DIR/MERGE_HEAD" \