Mercurial > hg
diff tests/test-push-checkheads-pruned-B7.t @ 34123:9c07cff039bc
filemerge: flush if using deferred writes when running a merge tool
Since merge tools might read from the filesystem, we need to write out our
deferred writes here.
No-ops if not using deferred writes.
Differential Revision: https://phab.mercurial-scm.org/D627
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Mon, 11 Sep 2017 13:03:27 -0700 |
| parents | b11e8c67fb0f |
| children | 4441705b7111 |