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>
Vasco Almeida committed
Jun 17, 2016 at 20:20 UTC
ff3b018d2f7d6ed9ebf7d728b2fa2b5d0bb1b207
1 file changed
+1
-5
git-merge-octopus.sh
+1
-5
@@ -5,16 +5,12 @@
5
# Resolve two or more trees.
6
#
7
8
+. git-sh-setup
9
. git-sh-i18n
10
11
LF='
12
'
13
13
-die () {
14
- echo >&2 "$*"
15
- exit 1
16
-}
17
-
14
# The first parameters up to -- are merge bases; the rest are heads.
15
bases= head= remotes= sep_seen=
16
for arg