diff options
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= |