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

diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index 390d85ccaea6ada3f3bce6148bcdd84d4f0bc2ac..d66fd9d2314774a0b31eadb23f8c00c199276d84 100644 (file)
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]
-                  [--sort=<key>]\* [--format=<format>] [<pattern>...]
+                  [--sort=<key>]* [--format=<format>] [<pattern>...]
 
 DESCRIPTION
 -----------