[Updated] D11999: merge: consider the file merged when using :merge-{local, other}

[Alphare (Raphaël Gomès)]

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


  This makes the message more consistent with `merging FILE`, which always bothered me slightly

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

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