##// END OF EJS Templates
merge: introduce mergeresult.addfile() and use it...
merge: introduce mergeresult.addfile() and use it We want to use mergeresult object at more and more places instead of this actions dict to simplify code and further add new APIs to mergeresult object. This patch introduces `addfile()` which adds a new file to the internal actions dict for now. Differential Revision: https://phab.mercurial-scm.org/D8820

File last commit:

r29437:6ab3465d default
r45839:b442920a 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>