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

[durin42 (Augie Fackler)]

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

REPOSITORY
  rHG Mercurial

BRANCH
  stable

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/20200518/5d333a93/attachment-0002.html>