D7999: merge: make hg.merge() take a context instead of a node

[durin42 (Augie Fackler)]

This revision now requires changes to proceed.
durin42 added a comment.
durin42 requested changes to this revision.


  Breaks `test-merge2.t` but otherwise seems like a good series.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7999/new/

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

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