Merge branch 'jc/merge-msg'

* jc/merge-msg:
fmt-merge-msg: do not add excess newline at the end.
fmt-merge-msg: say which branch things were merged into unless 'master'