Changed the "s" modifier to "w" for a word-splitting merge file.

diff --git a/exclude.c b/exclude.c
index e458b86..9b96f53 100644 (file)
--- a/exclude.c
+++ b/exclude.c
@@ -683,7 +683,7 @@ static const char *get_filter_tok(const char *p, int xflags,
                        case 'n':
                                mflags |= MATCHFLG_NO_INHERIT;
                                break;
-                       case 's':
+                       case 'w':
                                mflags |= MATCHFLG_WORD_SPLIT;
                                break;
                        }