merge-recursive: add computation of collisions due to dir rename & merging

diff --git a/environment.c b/environment.c
index a3abdd3c586da99f0d48711a52fd0014f2699e85..63ac38a46f8f01ee3d09ed8e09bd93acba63b21a 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