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

r35548:acd8a245 default
r40502:b57f2734 default
Show More
graphentry.tmpl
9 lines | 371 B | application/x-cheetah | CheetahLexer
<li class="parity{parity}" data-node="{node|short}">
<div class="fg">
<span class="desc">
<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>
</span>
{alltags}
<div class="info"><span class="age">{date|rfc822date}</span>, by {author|person}</div>
</div>
</li>