diff options
| author | freku045@student.liu.se <freku045@student.liu.se> | 2005-12-13 23:30:31 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-14 02:53:43 -0800 |
| commit | 806f36d4d7caf75b6d3e098cb0353d85d3477c7d (patch) | |
| tree | 7925350d3228cd00602abb91fe8712c236ddb2bb /git-merge.sh | |
| parent | aa9dc7afd2fc40466b430b35fc5c82d3c820cb26 (diff) | |
| download | git-806f36d4d7caf75b6d3e098cb0353d85d3477c7d.tar.gz git-806f36d4d7caf75b6d3e098cb0353d85d3477c7d.tar.xz | |
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-x | git-merge.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/git-merge.sh b/git-merge.sh index d25ae4b82..e50fbb116 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= |