[Updated] D11879: simplemerge: stop merging file flags

[Alphare (Raphaël Gomès)]

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


  Looks like we're happy!

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

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