[Updated] D12111: merge: stop using merge action for pathconflict option

[Alphare (Raphaël Gomès)]

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


  If anyone is as puzzled as I am as to what this is, it's for `remote` (as opposed to `local`), see `mercurial/merge.py:1535`.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

To: marmoute, #hg-reviewers, Alphare
Cc: Alphare, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20220203/9586d522/attachment.html>