Skip to content
Snippets Groups Projects
Martin von Zweigbergk's avatar
Martin von Zweigbergk authored
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).

Differential Revision: https://phab.mercurial-scm.org/D11973
ce8c82a5
History
Name Last commit Last update