[Updated] D11901: simplemerge: add a specialized function for "union", "local", "other"

[Alphare (Raphaël Gomès)]

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


  The stack stops applying here. I've queued the previous changes, but this appears to not have been rebased.

REPOSITORY
  rHG Mercurial

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

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

To: martinvonz, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211220/78d7a2f9/attachment-0002.html>