summaryrefslogtreecommitdiff
path: root/Documentation/asciidoc.conf
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-16 08:22:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-16 08:22:10 (GMT)
commit5bd148bfe8a4f2df8487e029cd4ee6809bc4c963 (patch)
tree1960d9d9011cb728631b357c928745b42d096eda /Documentation/asciidoc.conf
parentc5f71ad09994b46d80878ce72d1ca6f59935d952 (diff)
parentc7c84859ad586ae5670224e1abc4f846f7c3a9ae (diff)
downloadgit-5bd148bfe8a4f2df8487e029cd4ee6809bc4c963.zip
git-5bd148bfe8a4f2df8487e029cd4ee6809bc4c963.tar.gz
git-5bd148bfe8a4f2df8487e029cd4ee6809bc4c963.tar.bz2
Merge branch 'maint' to sync with GIT 1.5.2.2
Diffstat (limited to 'Documentation/asciidoc.conf')
-rw-r--r--Documentation/asciidoc.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 99302c5..6b6220d 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -8,7 +8,8 @@
# the command.
[attributes]
-caret=^
+plus=&#43;
+caret=&#94;
startsb=&#91;
endsb=&#93;
tilde=&#126;