Merge branch 'jc/fmt-merge-msg-people'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2012 22:48:33 +0000 (15:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2012 22:48:33 +0000 (15:48 -0700)
The "fmt-merge-msg" command learns to list the primary contributors
involved in the side topic you are merging.

* jc/fmt-merge-msg-people:
  fmt-merge-msg: show those involved in a merged series


Trivial merge