Fix outputting comments into merge message

This hasn't worked properly since the initial commit.  Add a test to
make sure we don't break it again in the future.

Signed-off-by: John Keeping <john@keeping.me.uk>