Merge branch 'jc/merge-msg'
authorJunio C Hamano <junkio@cox.net>
Mon, 20 Feb 2006 05:18:17 +0000 (21:18 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 20 Feb 2006 05:18:17 +0000 (21:18 -0800)
commit73be17f0b387b2741646498a9a80da677a9e0c7a
treee5d845a0d0da8926a8370987b44ebb34f690c6f0
parent1561a9b662bb4721e01654c44854efffa005169e
parenta15f43312f6962959e8daa33df0cf5357852a4b8
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'