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: https://git.lorimer.id.au/gitweb.git/diff_plain/ff3b018d2f7d6ed9ebf7d728b2fa2b5d0bb1b207?ds=inline;hp=ff3b018d2f7d6ed9ebf7d728b2fa2b5d0bb1b207

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>
---