Mercurial > hg
view mercurial/templates/paper/error.tmpl @ 26572:c7850af6bb75
filemerge._merge: drop no longer necessary 'if r:' check
Cleanup from an earlier patch to make premerge be directly called from the main
filemerge function.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Thu, 08 Oct 2015 14:16:19 -0700 |
parents | ac08ff370977 |
children | cba4461aa0a0 |
line wrap: on
line source
{header} <title>{repo|escape}: error</title> </head> <body> <div class="container"> <div class="menu"> <div class="logo"> <a href="{logourl}"> <img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial" /></a> </div> <ul> <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">log</a></li> <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li> <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li> <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li> </ul> <ul> <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> </ul> </div> <div class="main"> <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2> <h3>error</h3> <form class="search" action="{url|urlescape}log"> {sessionvars%hiddenformentry} <p><input name="rev" id="search1" type="text" size="30"></p> <div id="hint">{searchhint}</div> </form> <div class="description"> <p> An error occurred while processing your request: </p> <p> {error|escape} </p> </div> </div> </div> {footer}