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

r18526:9409aeaa stable
r45835:0c849f01 default
Show More
notfound.tmpl
18 lines | 397 B | application/x-cheetah | CheetahLexer
{header}
<title>Mercurial repository not found</title>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a> Not found: {repo|escape}
</div>
<div class="page_body">
The specified repository "{repo|escape}" is unknown, sorry.
<br/>
<br/>
Please go back to the <a href="{url|urlescape}">main repository list page</a>.
</div>
{footer}