summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorfreku045@student.liu.se <freku045@student.liu.se>2005-12-13 22:30:31 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-14 10:53:43 (GMT)
commit806f36d4d7caf75b6d3e098cb0353d85d3477c7d (patch)
tree7925350d3228cd00602abb91fe8712c236ddb2bb /git-merge.sh
parentaa9dc7afd2fc40466b430b35fc5c82d3c820cb26 (diff)
downloadgit-806f36d4d7caf75b6d3e098cb0353d85d3477c7d.zip
git-806f36d4d7caf75b6d3e098cb0353d85d3477c7d.tar.gz
git-806f36d4d7caf75b6d3e098cb0353d85d3477c7d.tar.bz2
Trivial usage string clean-up
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/git-merge.sh b/git-merge.sh
index d25ae4b..e50fbb1 100755
--- 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=