errors: raise StateError on uncommitted changes when merge starts
Differential Revision: https://phab.mercurial-scm.org/D9393
{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="container">
<div class="menu">
<div class="logo">
<a href="{logourl}">
<img src="{staticurl|urlescape}{logoimg}" 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 class="active">bookmarks</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 class="atom-logo">
<a href="{url|urlescape}atom-bookmarks" title="subscribe to atom feed">
<img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed" />
</a>
</div>
</div>
<div class="main">
<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
<h3>bookmarks</h3>
{searchform}
<table class="bigtable">
<thead>
<tr>
<th>bookmark</th>
<th>node</th>
</tr>
</thead>
<tbody class="stripes2">
{entries%bookmarkentry}
</tbody>
</table>
</div>
</div>
{footer}