smashwilson/merge-conflicts — pull request #25 by smashwilson (2014-03-19 22:40:06+00:00)
Title: Show a message when there aren't any conflicts to resolve.

Rather than show an empty `MergeConflictView`, show a `MessageView` telling you there's nothing to do and terminate merge-mode right away. Fixes #21.