thegarage/thegarage-gitx — pull request #18 by cgullick (2014-09-24 15:04:52+00:00)
Title: add-resume-feature-to-update-command

### Changelog
* added merge conflict error to update command