[Updated] D8822: merge: pass mergeresult in checkpassconflicts() instead of actions (API)

[indygreg (Gregory Szorc)]

This revision is now accepted and ready to land.
indygreg accepted this revision.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

To: pulkit, #hg-reviewers, indygreg
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200802/3d15e850/attachment-0001.html>