Page MenuHomePhabricator

simplemerge: rewrite `merge_lines()` using `merge_groups()`

Authored by martinvonz on Thu, Jan 6, 3:35 PM.

Diff Detail

rHG Mercurial
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Thu, Jan 6, 3:35 PM
martinvonz added a comment.EditedThu, Jan 6, 3:38 PM

I refactored it a bit to try to convince pytype. That resulted in 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]]]).

Alphare accepted this revision.Fri, Jan 7, 4:52 AM
Alphare added a subscriber: Alphare.

Superseeds D11904

This revision is now accepted and ready to land.Fri, Jan 7, 4:52 AM