##// 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:

r18526:9409aeaa stable
r40502:b57f2734 default
Show More
notfound.tmpl
18 lines | 397 B | application/x-cheetah | CheetahLexer
{header}
<title>Mercurial repository not found</title>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a> Not found: {repo|escape}
</div>
<div class="page_body">
The specified repository "{repo|escape}" is unknown, sorry.
<br/>
<br/>
Please go back to the <a href="{url|urlescape}">main repository list page</a>.
</div>
{footer}