Merge branch 'ls/git-gui-no-double-utf8-author-name'

diff --git a/environment.c b/environment.c
index 8289c25b44d74a0f054f9fe3eaf44c5fdcf0b3d2..8fa032f3074255541dc3f3d926fedf6b1991dd91 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -76,6 +76,7 @@ int protect_hfs = PROTECT_HFS_DEFAULT;
 #define PROTECT_NTFS_DEFAULT 0
 #endif
 int protect_ntfs = PROTECT_NTFS_DEFAULT;
+const char *core_fsmonitor;
 
 /*
  * The character that begins a commented line in user-editable file