[Commented On] D11391: filemerge: be more strict when detecting conflict markers, add `|` markers

[Alphare (Raphaël Gomès)]

Alphare added a comment.


  I'll send this on `stable` since I would say that's a bug.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

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