Page MenuHomePhabricator

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

Authored by martinvonz on Wed, Jan 12, 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
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.