##// END OF EJS Templates
simplemerge: split out function for rendering :merge3 conflict markers...
simplemerge: split out function for rendering :merge3 conflict markers The results in some duplicate, but the code is very straight-forward and I think it's worth it to have each conflict marker style in a separate function. Differential Revision: https://phab.mercurial-scm.org/D11978

File last commit:

r29437:6ab3465d default
r49410:69e76b2a default
Show More
branchentry.tmpl
8 lines | 315 B | application/x-cheetah | CheetahLexer
<entry>
<title>{branch|escape}</title>
<link rel="alternate" href="{urlbase}{url|urlescape}rev/{node|short}"/>
<id>{urlbase}{url|urlescape}#branch-{node}</id>
<updated>{date|rfc3339date}</updated>
<published>{date|rfc3339date}</published>
<content type="text">{branch|strip|escape}</content>
</entry>