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

r29437:6ab3465d default
r49406:c6649c53 default
Show More
branchentry.tmpl
8 lines | 315 B | application/x-cheetah | CheetahLexer
Angel Ezquerra
hgweb: add branches RSS and Atom feeds...
r18045 <entry>
<title>{branch|escape}</title>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <link rel="alternate" href="{urlbase}{url|urlescape}rev/{node|short}"/>
<id>{urlbase}{url|urlescape}#branch-{node}</id>
Angel Ezquerra
hgweb: add branches RSS and Atom feeds...
r18045 <updated>{date|rfc3339date}</updated>
<published>{date|rfc3339date}</published>
av6
hgweb: remove unnecessary CDATA markup in atom/branchentry.tmpl...
r29437 <content type="text">{branch|strip|escape}</content>
Angel Ezquerra
hgweb: add branches RSS and Atom feeds...
r18045 </entry>