Merge branch 'rt/commentchar-fmt-merge-msg' into maint
commit0222bc91022cdd6f6b87afb4d01bbac964d05702
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 18:10:47 +0000 (26 11:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 18:10:47 +0000 (26 11:10 -0700)
tree373d604e149c97e312ddc620e2d2df639cc6590d
parent167843f285fdb7dbb95882f01f01757928a91ce8
parent16a794de889ecc11ccbcd5ecf998a128d6dbfa97
Merge branch 'rt/commentchar-fmt-merge-msg' into maint

* rt/commentchar-fmt-merge-msg:
  t6200: avoid path mangling issue on Windows
  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