From 806f36d4d7caf75b6d3e098cb0353d85d3477c7d Mon Sep 17 00:00:00 2001 From: "freku045@student.liu.se" Date: Tue, 13 Dec 2005 23:30:31 +0100 Subject: Trivial usage string clean-up Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- git-resolve.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'git-resolve.sh') diff --git a/git-resolve.sh b/git-resolve.sh index fcc5ad7349..9263070054 100755 --- a/git-resolve.sh +++ b/git-resolve.sh @@ -4,11 +4,9 @@ # # Resolve two trees. # -. git-sh-setup -usage () { - die "git-resolve " -} +USAGE=' ' +. git-sh-setup dropheads() { rm -f -- "$GIT_DIR/MERGE_HEAD" \ -- cgit v1.3