smashwilson/merge-conflicts — pull request #58 by smashwilson (2014-05-29 14:48:22+00:00)
Title: Provide more user-friendly errors for git operations

See #42. Let's show errors in a nice overlay.