diff options
Diffstat (limited to 'git-merge-octopus.sh')
| -rwxr-xr-x | git-merge-octopus.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index bb58e22a18..7adffdc795 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -8,6 +8,11 @@ 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 |