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

[martinvonz (Martin von Zweigbergk)]

martinvonz added a comment.


  I refactored it a bit to try to convince pytype. That resulted in D11966 <https://phab.mercurial-scm.org/D11966>. I still don't understand what pytype was thinking. It didn't help to add explicit type annotations (something like `Union[Tuple[bytes, List[bytes]], Tuple[bytes, List[bytes], List[bytes], List[bytes]])`.)

REPOSITORY
  rHG Mercurial

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

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

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