D627: filemerge: flush if using deferred writes when running a merge tool

[martinvonz (Martin von Zweigbergk)]

martinvonz added inline comments.

INLINE COMMENTS

> filemerge.py:500-503
> +    # Must flush any deferred contents if running a merge tool.
> +    from . import context
> +    if isinstance(wctx, context.overlayworkingctx):
> +        wctx.flushall()

As Phil and I talked about out-of-band, it seems like this can be done in _filemerge() instead (~line 677) and we won't need to pass the wctx to all the merge tools (i.e. drop https://phab.mercurial-scm.org/D450).

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D627

To: phillco, #hg-reviewers
Cc: martinvonz, mercurial-devel