##// END OF EJS Templates
resolve: restore .orig only after merge is fully complete (issue4952)...
resolve: restore .orig only after merge is fully complete (issue4952) Previously, we'd restore the .orig file after the premerge is complete but before the merge was complete. This would lead to the .orig file potentially containing merge conflict markers in it, as a leftover from the last merge attempt.

File last commit:

r18258:bebb05a7 default
r26959:ed5f20f9 stable
Show More
index.tmpl
19 lines | 472 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
<title>Mercurial repositories index</title>
</head>
<body>
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258 <h2><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
<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>
Dan Villiom Podlaski Christiansen
templates: rename `Last change' column in hgwebdir repository list....
r10301 <td><a href="?sort={sort_lastchange}">Last modified</a></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td>&nbsp;</td>
</tr>
{entries%indexentry}
</table>
{footer}