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

r9999:f91e5630 default
r49389:912668d9 default
Show More
filelog.tmpl
6 lines | 174 B | application/x-cheetah | CheetahLexer
{header}
<title>{repo|escape}: {file|escape} history</title>
<description>{file|escape} revision history</description>
{entries%filelogentry}
</channel>
</rss>