diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-06-16 10:22:10 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-06-16 10:22:10 +0200 |
commit | 5bd148bfe8a4f2df8487e029cd4ee6809bc4c963 (patch) | |
tree | 1960d9d9011cb728631b357c928745b42d096eda /Documentation/asciidoc.conf | |
parent | git-svn: avoid string eval for defining functions (diff) | |
parent | GIT 1.5.2.2 (diff) | |
download | git-5bd148bfe8a4f2df8487e029cd4ee6809bc4c963.tar.xz git-5bd148bfe8a4f2df8487e029cd4ee6809bc4c963.zip |
Merge branch 'maint' to sync with GIT 1.5.2.2
Diffstat (limited to 'Documentation/asciidoc.conf')
-rw-r--r-- | Documentation/asciidoc.conf | 3 |
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=+ +caret=^ startsb=[ endsb=] tilde=~ |