[Changed Subscribers] D9835: resolve: also detect new :mergediff conflict markers

[spectral (Kyle Lippincott)]

spectral added inline comments.

INLINE COMMENTS

> filemerge.py:1199
> +        re.search(
> +            br"^(<<<<<<<.*|=======|------- .*|\+\+\+\+\+\+\+ .*|>>>>>>>.*)$",
> +            data,

Will mergediff always have a `-{7} .*` and `\+{7} .*`? i.e. could/should we keep it as:

  ^(<<<<<<< .*|=======|>>>>>>> .*)$

And just add the two new cases? We don't need to match every line, just any line.

  ^(<<<<<<< .*|------- .*|\+\+\+\+\+\+\+ .*|=======|>>>>>>> .*)$

If it's not guaranteed there will be a `-{7} .*` or a `+{7} .*`, this won't work, obviously.

REPOSITORY
  rHG Mercurial

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

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

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