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

r43177:92593d72 default
r49405:ce8c82a5 default
Show More
requirements.txt.in
4 lines | 28 B | text/plain | TextLexer
boto3
paramiko
pypsrp
twine