Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 99302c5bebb6017e34371bf12dafeab97447bda5..6b6220dfdbd6cacb8a05be4995279bbd0487fada 100644 (file)
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -8,7 +8,8 @@
 # the command.
 
 [attributes]
-caret=^
+plus=+
+caret=^
 startsb=[
 endsb=]
 tilde=~