conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index cc562a057af3694d3518bc91b52ae322b6b1d9cc..e2237ae4a0a80b0e5aa22cbb13aa5a01ce4fb891 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -321,7 +321,7 @@ excluded from the output.
        reflog entries from the most recent one to older ones.
        When this option is used you cannot specify commits to
        exclude (that is, '{caret}commit', 'commit1..commit2',
-       nor 'commit1...commit2' notations cannot be used).
+       nor 'commit1\...commit2' notations cannot be used).
 +
 With '\--pretty' format other than oneline (for obvious reasons),
 this causes the output to have two extra lines of information