merge-recursive: Move rename/delete handling into dedicated function

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index b5f0f29d1f736f2e6a0c544d682b973b95420191..aea8627be088c58ef9ad7fd07f5498da88d9b1fc 100644 (file)
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -20,6 +20,7 @@ backslash=\
 tilde=~
 apostrophe='
 backtick=`
+litdd=--
 
 ifdef::backend-docbook[]
 [linkgit-inlinemacro]