[Commented On] D11879: simplemerge: stop merging file flags

[marmoute (Pierre-Yves David)]

marmoute added a comment.
marmoute accepted this revision.


  Thanks for your patience/
  
  I had a deeper looks and that seems correct. I agree that Martin that this logic is messy and probably need a refactoring. If you could follow up with a comment pointing out what is going on flag-wise in simplemerge.py, that would be great.

REPOSITORY
  rHG Mercurial

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

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

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