##// 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
changelog.tmpl
10 lines | 282 B | application/x-cheetah | CheetahLexer
{header}
<!-- Changelog -->
<id>{urlbase}{url|urlescape}</id>
<link rel="self" href="{urlbase}{url|urlescape}atom-log"/>
<link rel="alternate" href="{urlbase}{url|urlescape}"/>
<title>{repo|escape} Changelog</title>
{latestentry%feedupdated}
{entries%changelogentry}
</feed>