##// END OF EJS Templates
merge: introduce hasconflicts() on mergeresult object...
merge: introduce hasconflicts() on mergeresult object This and upcoming patches will improve the mergeresult object making it more powerful and provide clean APIs for various things. Doing this will clean up the core merge code which is present in `update()` a bit. Differential Revision: https://phab.mercurial-scm.org/D8816

File last commit:

r29437:6ab3465d default
r45835:0c849f01 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>