D382: simplemerge: make context parameters non-optional

[phillco (Phil Cohen)]

phillco added inline comments.

INLINE COMMENTS

> martinvonz wrote in simplemerge.py:428
> Can this still be true? I.e., is it valid to pass None instead of one of the contexts?

Sent as https://phab.mercurial-scm.org/D520.

REPOSITORY
  rHG Mercurial

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

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