[PATCH 08/21] merge-octupus: use die shell function from git-sh-setup.sh

From: Vasco Almeida <vascomalmeida@sapo.pt>
Date: May 18, 2016, 15:27 UTC
Message-ID: <1463585274-9027-9-git-send-email-vascomalmeida@sapo.pt>
In-Reply-To: <1463585274-9027-1-git-send-email-vascomalmeida@sapo.pt>

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>
---
 git-merge-octopus.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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

-- 
2.7.3