t6023: merge-file fails to output anything for a degenerate merge

diff --git a/dir.c b/dir.c
index cfaa28ff23acb462aa0cfd54a405316320ec3bc8..4e6b988d37a0fb58fde4a170ebf7fe3702a3a474 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -58,7 +58,7 @@ static inline int special_char(unsigned char c1)
 }
 
 /*
- * Does 'match' matches the given name?
+ * Does 'match' match the given name?
  * A match is found if
  *
  * (1) the 'match' string is leading directory of 'name', or
@@ -139,7 +139,7 @@ int match_pathspec(const char **pathspec, const char *name, int namelen, int pre
 
 static int no_wildcard(const char *string)
 {
-       return string[strcspn(string, "*?[{")] == '\0';
+       return string[strcspn(string, "*?[{\\")] == '\0';
 }
 
 void add_exclude(const char *string, const char *base,
@@ -292,7 +292,7 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen)
        dir->basebuf[baselen] = '\0';
 }
 
-/* Scan the list and let the last match determines the fate.
+/* Scan the list and let the last match determine the fate.
  * Return 1 for exclude, 0 for include and -1 for undecided.
  */
 static int excluded_1(const char *pathname,