##// END OF EJS Templates
resolve: fix incorrect merge...
resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

File last commit:

r18258:bebb05a7 default
r27025:ec372573 default
Show More
index.tmpl
19 lines | 472 B | application/x-cheetah | CheetahLexer
{header}
<title>Mercurial repositories index</title>
</head>
<body>
<h2><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
<table>
<tr>
<td><a href="?sort={sort_name}">Name</a></td>
<td><a href="?sort={sort_description}">Description</a></td>
<td><a href="?sort={sort_contact}">Contact</a></td>
<td><a href="?sort={sort_lastchange}">Last modified</a></td>
<td>&nbsp;</td>
</tr>
{entries%indexentry}
</table>
{footer}