From ff3b018d2f7d6ed9ebf7d728b2fa2b5d0bb1b207 Mon Sep 17 00:00:00 2001 From: Vasco Almeida Date: Fri, 17 Jun 2016 20:20:57 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- git-merge-octopus.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'git-merge-octopus.sh') 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 -- cgit v1.2.3