summaryrefslogtreecommitdiff
path: root/Documentation/asciidoc.conf
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-03 09:43:42 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-03 09:43:42 -0700
commit7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6 (patch)
tree7b77d403201c495a69ffb2123d64fcea03f2e05c /Documentation/asciidoc.conf
parentb9f171cc3b3f7f528acf672b5fef7e95b153213b (diff)
parent2839478774f48074d7d87b8a9838827742a5b058 (diff)
downloadgit-7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6.tar.gz
Merge branch 'jc/maint-doc-em-dash'
* jc/maint-doc-em-dash: Work around em-dash handling in newer AsciiDoc
Diffstat (limited to 'Documentation/asciidoc.conf')
-rw-r--r--Documentation/asciidoc.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index b5f0f29d1f..aea8627be0 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -20,6 +20,7 @@ backslash=&#92;
tilde=&#126;
apostrophe=&#39;
backtick=&#96;
+litdd=&#45;&#45;
ifdef::backend-docbook[]
[linkgit-inlinemacro]