merge-octopus: use die shell function from git-sh-setup.sh
authorVasco Almeida <vascomalmeida@sapo.pt>
Fri, 17 Jun 2016 20:20:57 +0000 (20:20 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Jun 2016 22:45:48 +0000 (15:45 -0700)
commitff3b018...2f7d6ed9ebf7d728b2fa2b5d0bb1b207
tree1a4c151...112c09ade6e4264c173d538c6d9a16f4copy hash to clipboard (tree)
parent6a4eb91...73fa88bfbeb8d570895052b2b28693cfcopy hash to clipboard (diff)
git-merge-octopus.sh