conflict_rename_delete(): Check whether D/F conflicts are still present

diff --git a/compat/mingw.c b/compat/mingw.c
index 24333cb167f785cbcf29775eec1237259221e89c..f2d9e1fd974b7271366da09370e10fafd2c50f08 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -646,7 +646,7 @@ static char *lookup_prog(const char *dir, const char *cmd, int isexe, int exe_on
 }
 
 /*
- * Determines the absolute path of cmd using the the split path in path.
+ * Determines the absolute path of cmd using the split path in path.
  * If cmd contains a slash or backslash, no lookup is performed.
  */
 static char *path_lookup(const char *cmd, char **path, int exe_only)