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

r32762:2d93d215 default
r45835:0c849f01 default
Show More
bookmarks.tmpl
35 lines | 1.2 KiB | application/x-cheetah | CheetahLexer
{header}
<title>{repo|escape}: Bookmarks</title>
<link rel="alternate" type="application/atom+xml"
href="{url|urlescape}atom-bookmarks" title="Atom feed for {repo|escape}: bookmarks"/>
<link rel="alternate" type="application/rss+xml"
href="{url|urlescape}rss-bookmarks" title="RSS feed for {repo|escape}: bookmarks"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / bookmarks
</div>
<div class="page_nav">
<div>
<a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> |
<a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> |
<a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> |
bookmarks |
<a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url|urlescape}file{sessionvars%urlparameter}">files</a> |
<a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
</div>
{searchform}
</div>
<div class="title">&nbsp;</div>
<table cellspacing="0">
{entries%bookmarkentry}
</table>
{footer}