merge-recursive: mark rename/delete conflict as unmerged

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 6fc20b0baf1592c88deecc37636b1c644483616b..7c129cb24f0e1c902a81b996ce84ab7e614079c4 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -98,7 +98,7 @@ OPTIONS
        Record only the fact that the path will be added later. An entry
        for the path is placed in the index with no content. This is
        useful for, among other things, showing the unstaged content of
-       such files with 'git diff' and commiting them with 'git commit
+       such files with 'git diff' and committing them with 'git commit
        -a'.
 
 --refresh::