Fix WatchmanEventWatcher to prevent starting hh_server in hg.filemerge state
treed7e496c43e3046ff644ca4199cc2c11e289ba668
-rw-r--r-- 1369 .gitignore
-rw-r--r-- 114 .gitmodules
drwxr-xr-x - CMake
-rw-r--r-- 3931 CMakeLists.txt
-rw-r--r-- 249 CODE_OF_CONDUCT.md
-rw-r--r-- 3334 CONTRIBUTING.md
-rw-r--r-- 637 ISSUE_TEMPLATE.md
-rw-r--r-- 3204 LICENSE.PHP
-rw-r--r-- 2803 LICENSE.ZEND
-rw-r--r-- 3347 README.md
-rwxr-xr-x 642 configure
drwxr-xr-x - hphp
drwxr-xr-x - patches
m--------- - third-party