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

r26421:4b0fc75f default
r40502:b57f2734 default
Show More
error.tmpl
10 lines | 241 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
<title>Error</title>
<description>Error</description>
<item>
<title>Error</title>
<description>{error|escape}</description>
Matt Mackall
urls: bulk-change primary website URLs
r26421 <guid>https://mercurial-scm.org/#error</guid>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </item>
</channel>
</rss>