Trivial usage string clean-up

[git.git] / git-merge.sh
diff --git a/git-merge.sh b/git-merge.sh

index d25ae4b..e50fbb1 100755 (executable)
--- 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=