##// END OF EJS Templates
filemerge: return whether the file is deleted for nomerge internal tools...
filemerge: return whether the file is deleted for nomerge internal tools We're going to support the filemerge code resolving change/delete conflicts in upcoming patches. Some of these resolutions require that the dirstate be modified. Modifying the dirstate directly from in here would be (a) a pretty bad layering violation and (b) wrong because all dirstate removals should happen before adds. So in this and upcoming patches we're instead going to pass whether the file is deleted up to merge.mergestate, then in there figure out what dirstate action needs to be taken.

File last commit:

r25871:20ed5677 stable
r27032:28ee7af4 default
Show More
index.tmpl
27 lines | 720 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>
<div class="page_header">
Steven Stallion
hgweb: support alternate logo url...
r13964 <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258 <a href="/">Mercurial</a> {pathdef%breadcrumb}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
<table cellspacing="0">
<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>
<td>&nbsp;</td>
</tr>
{entries%indexentry}
</table>
<div class="page_footer">
{motd}
</div>
av6
hgweb: show ages in repos' Last modified column in monoblue and gitweb...
r25871 <script type="text/javascript">process_dates()</script>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </body>
</html>