Move the MessageViews into their own source file.
Show a friendly messages if there's nothing to merge.
Merge pull request #25 from smashwilson/no-conflicts

Show a message when there aren't any conflicts to resolve.