summaryrefslogtreecommitdiff
path: root/Documentation/asciidoc.conf
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-06-16 01:22:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-06-16 01:22:10 -0700
commit5bd148bfe8a4f2df8487e029cd4ee6809bc4c963 (patch)
tree1960d9d9011cb728631b357c928745b42d096eda /Documentation/asciidoc.conf
parentgit-svn: avoid string eval for defining functions (diff)
parentGIT 1.5.2.2 (diff)
downloadtgif-5bd148bfe8a4f2df8487e029cd4ee6809bc4c963.tar.xz
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 99302c5beb..6b6220dfdb 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;