diff options
Diffstat (limited to 'git-merge-octopus.sh')
| -rwxr-xr-x | git-merge-octopus.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index 89e967abe..d79fc8402 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -5,16 +5,12 @@ # Resolve two or more trees. # +. git-sh-setup . git-sh-i18n LF=' ' -die () { - echo >&2 "$*" - exit 1 -} - # The first parameters up to -- are merge bases; the rest are heads. bases= head= remotes= sep_seen= for arg |