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

[martinvonz (Martin von Zweigbergk)]

martinvonz added a comment.
martinvonz requested review of this revision.


  In D11901#183188 <https://phab.mercurial-scm.org/D11901#183188>, @Alphare wrote:
  
  > The stack stops applying here. I've queued the previous changes, but this appears to not have been rebased.
  
  Done.

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/9cb479b2/attachment-0002.html>