From: Vasco Almeida <vascomalmeida@sapo.pt>
Date: Fri, 17 Jun 2016 20:20:57 +0000 (+0000)
Subject: merge-octopus: use die shell function from git-sh-setup.sh
X-Git-Tag: v2.10.0-rc0~45^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff3b018d2f7d6ed9ebf7d728b2fa2b5d0bb1b207;p=thirdparty%2Fgit.git

merge-octopus: use die shell function from git-sh-setup.sh

Source git-sh-setup in order to use die shell function from
git-sh-setup.sh library instead of using the one defined in
git-merge-octopus.sh. Remove the former die function.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 89e967abec..d79fc84029 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