Merge branch 'jc/custom-comment-char'
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)
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"

1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc builtin/merge.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge
diff --cc environment.c
Simple merge
Simple merge
diff --cc wt-status.c
Simple merge