From: Junio C Hamano <junkio@cox.net>
Date: Mon, 20 Feb 2006 05:18:17 +0000 (-0800)
Subject: Merge branch 'jc/merge-msg'
X-Git-Tag: v1.3.0-rc1~189
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=73be17f0b387b2741646498a9a80da677a9e0c7a;p=git.git

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'
---

73be17f0b387b2741646498a9a80da677a9e0c7a