diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index bb58e22a18bdaefae3f8005e7b0a0cfaba4b4185..7adffdc7950baaf1da5b36913f78404c48c6d270 100755 (executable)
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
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