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

[martinvonz (Martin von Zweigbergk)]

martinvonz added a comment.


  In D11904#183252 <https://phab.mercurial-scm.org/D11904#183252>, @Alphare wrote:
  
  > This one was also not rebased and fails to apply. I'm queuing the previous ones
  
  It was rebased on my end, so I don't know what went wrong. I've rebased it again now and resent it. Hopefully it works this time.

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://mercurial-scm.org/pipermail/mercurial-patches/attachments/20220104/44118137/attachment.html>