##// END OF EJS Templates
merge: add ancestor to the update function...
merge: add ancestor to the update function This makes it easier to do rebase-like operations.

File last commit:

r13864:fd8a6ca3 stable
r13874:9d67277c default
Show More
error.tmpl
33 lines | 1.1 KiB | application/x-cheetah | CheetahLexer
{header}
<title>{repo|escape}: Error</title>
<link rel="alternate" type="application/atom+xml"
href="{url}atom-log" title="Atom feed for {repo|escape}"/>
<link rel="alternate" type="application/rss+xml"
href="{url}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / error
</div>
<div class="page_nav">
<a href="{url}summary{sessionvars%urlparameter}">summary</a> |
<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
<a href="{url}help{sessionvars%urlparameter}">help</a>
<br/>
</div>
<div class="page_body">
<br/>
<i>An error occurred while processing your request</i><br/>
<br/>
{error|escape}
</div>
{footer}