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)
commit8cd52c3ca9c865891d8f15db08af324aadb7b913
tree231da3633a9d81624a5b16550cbf376cc4ddfe47
parent290252e06341c05fcebb65784ad05c37656ae36d
parent2b020455f92ea3c20a78005dd19e7a127bb5b481
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.