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

diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 4ef03578ebc58f3b678e8805644ae8c0ad4b998b..9cd8ccef37f131d7913926ef9b5b7b49fe6d3463 100644 (file)
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -15,7 +15,7 @@ DESCRIPTION
 Compares the files in the working tree and the index.  When paths
 are specified, compares only those named paths.  Otherwise all
 entries in the index are compared.  The output format is the
-same as for 'git-diff-index' and 'git-diff-tree'.
+same as for 'git diff-index' and 'git diff-tree'.
 
 OPTIONS
 -------