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

r35052:e9a8a941 default
r40502:b57f2734 default
Show More
changelogentry.tmpl
16 lines | 489 B | application/x-cheetah | CheetahLexer
<div>
<a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
<span class="age">{date|rfc822date}</span>
{desc|strip|firstline|escape|nonempty}
{alltags}
</a>
</div>
<div class="title_text">
<div class="log_link">
<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a><br/>
</div>
<i>{author|obfuscate} [{date|rfc822date}] rev {rev}</i><br/>
</div>
<div class="log_body description">{desc|strip|escape|websub|nonempty}
</div>