Merge branch 'bp/fsmonitor'

diff --git a/dir.h b/dir.h
index fab8fc1561b582bbdb2d1706c437c6c0290204a1..233a2eb36bc00aa5fba48631408fa528d02a2d56 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -154,7 +154,8 @@ struct dir_struct {
                DIR_COLLECT_IGNORED = 1<<4,
                DIR_SHOW_IGNORED_TOO = 1<<5,
                DIR_COLLECT_KILLED_ONLY = 1<<6,
-               DIR_KEEP_UNTRACKED_CONTENTS = 1<<7
+               DIR_KEEP_UNTRACKED_CONTENTS = 1<<7,
+               DIR_SHOW_IGNORED_TOO_MODE_MATCHING = 1<<8
        } flags;
        struct dir_entry **entries;
        struct dir_entry **ignored;