Merge branch 'rt/commentchar-fmt-merge-msg'
commit948cf4f5e546876cade022640873f92dbc2de1ee
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Apr 2013 19:40:56 +0000 (15 12:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Apr 2013 19:40:56 +0000 (15 12:40 -0700)
treeeb88902047aa37c738adef6252382db7a615ec82
parente1a3f17e9d81f88ed5e62d01252167daa597e5a5
parent89c3bbd808b352a9f4047523b81b72f22eefb868
Merge branch 'rt/commentchar-fmt-merge-msg'

The new core.commentchar configuration was not applied to a few
places.

* rt/commentchar-fmt-merge-msg:
  fmt-merge-msg: use core.commentchar in tag signatures completely
  fmt-merge-msg: respect core.commentchar in people credits
builtin/fmt-merge-msg.c
t/t6200-fmt-merge-msg.sh