[Updated] D8830: mergeresult: introduce action -> (filename, data, msg) mapping and related API

[indygreg (Gregory Szorc)]

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


  I don't like having to store some metadata redundantly in 2 dicts. I'm approving this for now under the assumption that future commits will refactor this, as the commit message and an inline comment implies.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

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