[Updated] D8533: flags: actually merge flags in simplemerge

[martinvonz (Martin von Zweigbergk)]

martinvonz added a reverting change: rHG58a3be48ddd2: simplemerge: stop merging file flags.

REPOSITORY
  rHG Mercurial

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

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

To: marmoute, #hg-reviewers, durin42
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211220/449b819d/attachment-0002.html>