Guard against shipping with no changes

@kevgo please review
This is a `git merge` specific error message. It should be in `git merge`. I think you should follow the same pattern as in other parts, and call a method `error_no_commits_to_merge` from here, which is implemented in `git-merge`. This is a cleaner separation of application-specific UI (in this case text output) and mere git library functionality.