Merge branch 'jc/merge-msg' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 19 Feb 2006 07:15:12 +0000 (23:15 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 19 Feb 2006 07:15:12 +0000 (23:15 -0800)
* jc/merge-msg:
fmt-merge-msg: say which branch things were merged into unless 'master'
Add an Emacs interface in contrib.

Trivial merge