##// END OF EJS Templates
simplemerge: convert `merge_lines()` away from generator...
simplemerge: convert `merge_lines()` away from generator 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

File last commit:

r42237:675775c3 default
r49405:ce8c82a5 default
Show More
MANIFEST.in
9 lines | 139 B | text/plain | TextLexer
graft c-ext
graft debian
graft zstd
graft tests
include make_cffi.py
include setup_zstd.py
include zstd.c
include LICENSE
include NEWS.rst