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

r30558:7817df55 stable
r40502:b57f2734 default
Show More
filelogentry.tmpl
7 lines | 315 B | application/x-cheetah | CheetahLexer
<item>
<title>{desc|strip|firstline|strip|escape}</title>
<link>{urlbase}{url|urlescape}log/{node|short}/{file|urlescape}</link>
<description><![CDATA[{desc|strip|escape|websub|addbreaks|nonempty}]]></description>
<author>{author|obfuscate}</author>
<pubDate>{date|rfc822date}</pubDate>
</item>