##// 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
header.tmpl
5 lines | 149 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <?xml version="1.0" encoding="{encoding}"?>
<rss version="2.0">
<channel>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <link>{urlbase}{url|urlescape}</link>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <language>en-us</language>