Mercurial > hg
comparison tests/test-subrepo-deep-nested-change.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 | 8074e2d006c0 |
children | 0e4bed5c5c38 |
comparison
equal
deleted
inserted
replaced
34122:c0ce60459d84 | 34123:9c07cff039bc |
---|