[Updated] D11904: simplemerge: rewrite `merge_lines()` using `merge_groups()`

[Alphare (Raphaël Gomès)]

This revision now requires changes to proceed.
Alphare added a comment.
Alphare requested changes to this revision.


  This one was also not rebased and fails to apply. I'm queuing the previous ones

REPOSITORY
  rHG Mercurial

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

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

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