X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;fp=git-merge.sh;h=e50fbb1160ad6ccfebc0d65fcc54bc3488e597cd;hb=806f36d4d7caf75b6d3e098cb0353d85d3477c7d;hp=d25ae4b82d4208216bb7ce5b5d414ee8b2797865;hpb=aa9dc7afd2fc40466b430b35fc5c82d3c820cb26;p=git.git diff --git a/git-merge.sh b/git-merge.sh index d25ae4b8..e50fbb11 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -3,15 +3,13 @@ # Copyright (c) 2005 Junio C Hamano # + +USAGE='[-n] [--no-commit] [-s ]... +' . git-sh-setup LF=' ' -usage () { - die "git-merge [-n] [--no-commit] [-s ]... +" -} - all_strategies='recursive octopus resolve stupid ours' default_strategies='recursive' use_strategies=