Mercurial > hg
comparison mercurial/mergeutil.py @ 43388:51316de92ad0 stable
fsmonitor: reapply b1f62cd39b5c
The recent revendoring of pywatchman undid this changeset.
Let's reapply it.
This commit was generated by running `hg graft -f b1f62cd39b5c`.
It applied cleanly.
Differential Revision: https://phab.mercurial-scm.org/D7204
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sat, 02 Nov 2019 12:54:47 -0700 |
| parents | 8ff1ecfadcd1 |
| children | 32ce4cbaec4b |
comparison
equal
deleted
inserted
replaced
| 43387:9eed959cd8ae | 43388:51316de92ad0 |
|---|