##// 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
tagentry.tmpl
6 lines | 218 B | application/x-cheetah | CheetahLexer
<item>
<title>{tag|escape}</title>
<link>{urlbase}{url|urlescape}rev/{node|short}</link>
<description><![CDATA[{tag|strip|escape|addbreaks}]]></description>
<pubDate>{date|rfc822date}</pubDate>
</item>