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

r28712:80e92247 default
r45835:0c849f01 default
Show More
bookmarks.tmpl
11 lines | 372 B | application/x-cheetah | CheetahLexer
{header}
<id>{urlbase}{url|urlescape}</id>
<link rel="self" href="{urlbase}{url|urlescape}atom-bookmarks"/>
<link rel="alternate" href="{urlbase}{url|urlescape}bookmarks"/>
<title>{repo|escape}: bookmarks</title>
<summary>{repo|escape} bookmark history</summary>
<author><name>Mercurial SCM</name></author>
{lastchange%feedupdated}
{entries%bookmarkentry}
</feed>