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

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 45c52d2e57d2f4c2783c32b4cb3ff8f4dcd6414e..30e5c0eb14470a5f72174b1071eac79c55fb0c41 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -210,7 +210,7 @@ OPTIONS
        <upstream>.  May be any valid commit, and not just an
        existing branch name.
 +
-As a special case, you may use "A...B" as a shortcut for the
+As a special case, you may use "A\...B" as a shortcut for the
 merge base of A and B if there is exactly one merge base. You can
 leave out at most one of A and B, in which case it defaults to HEAD.