diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-06-17 20:20:57 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-17 15:45:48 -0700 |
| commit | ff3b018d2f7d6ed9ebf7d728b2fa2b5d0bb1b207 (patch) | |
| tree | 1a4c151d112c09ade6e4264c173d538c6d9a16f4 /git-merge-octopus.sh | |
| parent | 6a4eb91a73fa88bfbeb8d570895052b2b28693cf (diff) | |
| download | git-ff3b018d2f7d6ed9ebf7d728b2fa2b5d0bb1b207.tar.gz | |
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>
Diffstat (limited to 'git-merge-octopus.sh')
| -rwxr-xr-x | git-merge-octopus.sh | 6 |
1 files changed, 1 insertions, 5 deletions
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 |