[Updated] D12105: merge: break up a not-so-one-liner for readability

[Alphare (Raphaël Gomès)]

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

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

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