##// END OF EJS Templates
test: use the "correct" merge tool in `test-rebase-detach.t`...
test: use the "correct" merge tool in `test-rebase-detach.t` The value of `HGMERGE` overrides the value passed through --config. We are about to drop this `HGMERGE` environment variable so we update the value used in config to match what is currently in use. This is another example of confusion introduced by the `HGMERGE` environment variable.

File last commit:

r30765:eb7de21b default
r40502:b57f2734 default
Show More
footer.tmpl
17 lines | 486 B | application/x-cheetah | CheetahLexer
<div class="page-footer">
<p>Mercurial Repository: {repo|escape}</p>
<ul class="rss-logo">
<li><a href="{url|urlescape}rss-log">RSS</a></li>
<li><a href="{url|urlescape}atom-log">Atom</a></li>
</ul>
{motd}
</div>
<div id="powered-by">
<p><a href="{logourl}" title="Mercurial"><img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial" /></a></p>
</div>
</div>
</body>
</html>