Merge branch 'jc/custom-comment-char'
commit149a4211a4b8d8bbcdd72685d538d6ac7365e29e
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Feb 2013 18:23:49 +0000 (4 10:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Feb 2013 18:23:49 +0000 (4 10:23 -0800)
treef0e37272889876737f0216021ea8d23785763fa2
parentbcd45b4085f9269a536c8fb1963ac8380bfac0e8
parenteff80a9fd990de3605063050dae32f969ef18ba8
Merge branch 'jc/custom-comment-char'

Allow a configuration variable core.commentchar to customize the
character used to comment out the hint lines in the edited text from
the default '#'.

* jc/custom-comment-char:
  Allow custom "comment char"
Documentation/config.txt
builtin/branch.c
builtin/commit.c
builtin/fmt-merge-msg.c
builtin/merge.c
cache.h
config.c
environment.c
t/t7502-commit.sh
wt-status.c