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

diff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt
index c8899d528adfe37459b9301e16faab90e7a7e63d..bfceacacb34262b73507a87fa23995d1183a3edc 100644 (file)
--- a/Documentation/git-write-tree.txt
+++ b/Documentation/git-write-tree.txt
@@ -17,17 +17,17 @@ tree object is printed to standard output.
 
 The index must be in a fully merged state.
 
-Conceptually, 'git-write-tree' sync()s the current index contents
+Conceptually, 'git write-tree' sync()s the current index contents
 into a set of tree files.
 In order to have that match what is actually in your directory right
-now, you need to have done a 'git-update-index' phase before you did the
-'git-write-tree'.
+now, you need to have done a 'git update-index' phase before you did the
+'git write-tree'.
 
 
 OPTIONS
 -------
 --missing-ok::
-       Normally 'git-write-tree' ensures that the objects referenced by the
+       Normally 'git write-tree' ensures that the objects referenced by the
        directory exist in the object database.  This option disables this
        check.