git-checkout -m: fix merge case

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 8196d787ab13475200f7c0e739b21f525ba9e4ae..44b1ce4c6b56348e1661b60fc923cb80cb44d4ff 100644 (file)
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -11,6 +11,7 @@
 caret=^
 startsb=[
 endsb=]
+tilde=~
 
 ifdef::backend-docbook[]
 [gitlink-inlinemacro]