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

[pulkit (Pulkit Goyal)]

pulkit added a comment.
pulkit accepted this revision.


  I will queue this for stable branch.

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, pulkit
Cc: pulkit, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210909/026f3b09/attachment-0002.html>