merge-recursive: Avoid doubly merging rename/add conflict contents

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 6be8ba32505e53809477f07529cc5c7638bd20fe..aea8627be088c58ef9ad7fd07f5498da88d9b1fc 100644 (file)
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -16,9 +16,11 @@ plus=+
 caret=^
 startsb=[
 endsb=]
+backslash=\
 tilde=~
 apostrophe='
 backtick=`
+litdd=--
 
 ifdef::backend-docbook[]
 [linkgit-inlinemacro]