##// END OF EJS Templates
merge: implement --tool arguments using new ui.forcemerge configurable...
merge: implement --tool arguments using new ui.forcemerge configurable ui.forcemerge is set before calling into merge or resolve commands, then unset to prevent ui pollution for further operations. ui.forcemerge takes precedence over HGMERGE, but mimics HGMERGE behavior if the given --tool is not found by the merge-tools machinery. This makes it possible to do: hg resolve --tool="python mymerge.py" FILE With this approach, HGMERGE and ui.merge are not harmed by --tool

File last commit:

r10575:136eed1a stable
r12788:de793925 default
Show More
index.tmpl
39 lines | 1.1 KiB | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
<title>{repo|escape}: Mercurial repositories index</title>
</head>
<body>
<div id="container">
<div class="page-header">
<h1>Mercurial Repositories</h1>
<ul class="page-nav">
</ul>
</div>
Thomas Arendsen Hein
trailing spaces (and one stray tab)
r10575
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <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>
<div id="powered-by">
<p><a href="http://mercurial.selenic.com/" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p>
</div>
<div id="corner-top-left"></div>
<div id="corner-top-right"></div>
<div id="corner-bottom-left"></div>
<div id="corner-bottom-right"></div>
</div>
</body>
</html>