##// 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
11 lines | 227 B | application/x-cheetah | CheetahLexer
<div class="page_footer">
<div class="page_footer_text">{repo|escape}</div>
<div class="rss_logo">
<a href="{url|urlescape}rss-log">RSS</a>
<a href="{url|urlescape}atom-log">Atom</a>
</div>
<br />
{motd}
</div>
</body>
</html>