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

r18526:9409aeaa stable
r49388:3f5bc446 default
Show More
header.tmpl
5 lines | 149 B | application/x-cheetah | CheetahLexer
<?xml version="1.0" encoding="{encoding}"?>
<rss version="2.0">
<channel>
<link>{urlbase}{url|urlescape}</link>
<language>en-us</language>