Merge branch 'nk/perf-fsmonitor-cleanup' into maint
commite93f5c6878107eb2c468bdf00d53b19a6e8eae2f
authorJunio C Hamano <gitster@pobox.com>
Sat, 6 Feb 2021 00:31:22 +0000 (5 16:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 6 Feb 2021 00:31:22 +0000 (5 16:31 -0800)
tree0529ec30b3a97387c6c6d4a6c8e934d5bc556153
parenta08832f16e56207b2967b51c236f24e180a70107
parentcc2d43be2bc93f7016ee97b8d78a79d771e017e4
Merge branch 'nk/perf-fsmonitor-cleanup' into maint

Test fix.

* nk/perf-fsmonitor-cleanup:
  p7519: allow running without watchman prereq