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)
commit503c15ac0921338ef7e9e0ff4a6c9fcc18b2d8d5
tree6ee5d960c53ff1fe2c9697c23efab6c1cae9898d
parent0bb2ee1b7d30bbab593453a4d4a6013b8b0ffc5d
parent418a1435f19b8105de2ee94b54cc2962bc9b5f03
Merge branch 'jc/fmt-merge-msg-people'

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