thegarage / thegarage-gitx

97%

master: 100%

LAST BUILD ON BRANCH v2.5.0.beta1

branch: v2.5.0.beta1

CHANGE BRANCH

x

Reset

• v2.5.0.beta1
• 2.14.0
• add-coverage-nuke
• add-resume-feature-to-update-command
• add-resume-option-to-integrate-command
• changelog-ordering
• cleanup-load-path
• codeship
• create-pull-request-on-release
• fix-first-time-integrate
• fix-release-pull-request
• fix-start-branch-conflict
• fix-updating-commit-status
• git-review
• global-config
• invoke-command
• massive-refactor
• master
• oauth-client
• paveldruzyak-add-options
• peer-review-status
• posting-comment-on-integration
• prototype
• refactor-git
• release-cleanup-optional
• release-merge
• release-status
• remove-restclient
• remove-untested-code
• retry-auth
• review-bump
• review-comment-template
• review-release-from-any-branch
• rugged-upgrade
• staging
• test
• test-a
• test-b
• test-ci
• test-d
• test_c
• test_d
• v2.0.0
• v2.0.0.pre1
• v2.0.0.pre2
• v2.0.1
• v2.0.2
• v2.0.3
• v2.0.4
• v2.0.5
• v2.1.1
• v2.10.0
• v2.10.1
• v2.10.2
• v2.11.0
• v2.12.0
• v2.13.0
• v2.13.1
• v2.2.3
• v2.2.3.pre1
• v2.2.3.pre2
• v2.3.0.pre1
• v2.4.0
• v2.4.0.pre1
• v2.4.1
• v2.5.0
• v2.5.0.alpha1
• v2.5.0.beta2
• v2.5.0.beta3
• v2.5.0.beta4
• v2.5.0.beta5
• v2.5.1
• v2.6.0
• v2.7.0
• v2.7.1
• v2.7.2
• v2.8.0
• v2.8.1
• v2.9.0
• version-2.14.0

Build # 173

Build Type

push

travis-ci

Committed by cgullick

Commit Message

fixed merge conflict error message

* changed merge conflict error message to say instead of raise and
added exit

Run Details

888 of 917 relevant lines covered (96.84%)

2.0 hits per line