D372: simplemerge: add optional context parameters to simplemerge

[martinvonz (Martin von Zweigbergk)]

martinvonz added inline comments.

INLINE COMMENTS

> simplemerge.py:412
> +def simplemerge(ui, localfile, basefile, otherfile,
> +                localctx=None, basectx=None, otherctx=None, repo=None, **opts):
>      def readfile(filename):

Seems unfortunate to have both files and contexts. This is what you mentioned today you will replace by use of "arbitraryfilectx"?

REPOSITORY
  rHG Mercurial

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

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