##// 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:

r29813:5f86818c default
r49388:3f5bc446 default
Show More
map
2 lines | 45 B | text/plain | TextLexer
__base__ = ../paper/map
header = header.tmpl