checkout -f: deal with a D/F conflict entry correctly

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 0b0d6b8c8c2ab8833bb5d929ef0d3cb7891ec582..63ac998bfaf64da807bec0ae0bd57c391fb651fe 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -267,7 +267,7 @@ static int find_identical_files(struct file_similarity *src,
                        int score;
                        struct diff_filespec *source = p->filespec;
 
-                       /* False hash collission? */
+                       /* False hash collision? */
                        if (hashcmp(source->sha1, target->sha1))
                                continue;
                        /* Non-regular files? If so, the modes must match! */