From: Junio C Hamano <junkio@cox.net>
Date: Sun, 19 Feb 2006 07:15:12 +0000 (-0800)
Subject: Merge branch 'jc/merge-msg' into next
X-Git-Tag: v1.3.0-rc1~54^2~60
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8cd52c3ca9c865891d8f15db08af324aadb7b913;p=git.git

Merge branch 'jc/merge-msg' into next


* jc/merge-msg:
  fmt-merge-msg: say which branch things were merged into unless 'master'
  Add an Emacs interface in contrib.
---

8cd52c3ca9c865891d8f15db08af324aadb7b913