Page MenuHomePhabricator

simplemerge: convert `merge_lines()` away from generator
ClosedPublic

Authored by martinvonz on Jan 12 2022, 1:55 AM.

Details

Summary

We always consume all the lines and put them in a list anyway. By
making the function not a generator, we can later make it return an
additional value (to indicate if there were conflicts).

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage