##// END OF EJS Templates
simplemerge: make merge_lines() a free function...
simplemerge: make merge_lines() a free function IMO, the rendering of a conflict as text with merge markers should be separate from the code for resolving conflicts. The latter is what `Merge3Text` is mostly about already. Differential Revision: https://phab.mercurial-scm.org/D11974

File last commit:

r18526:9409aeaa stable
r49406:c6649c53 default
Show More
filelog.tmpl
8 lines | 265 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <id>{urlbase}{url|urlescape}atom-log/tip/{file|escape}</id>
<link rel="self" href="{urlbase}{url|urlescape}atom-log/tip/{file|urlescape}"/>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <title>{repo|escape}: {file|escape} history</title>
{latestentry%feedupdated}
{entries%changelogentry}
</feed>