##// END OF EJS Templates
test: also deactivate `ui.merge` when testing merge tool...
test: also deactivate `ui.merge` when testing merge tool We are about to introduce a default config for `ui.merge`. Since `test-merge-tools.t` is about testing merge configuration, we need to make sure it won't interfere.

File last commit:

r26421:4b0fc75f default
r40501:1736450c default
Show More
error.tmpl
10 lines | 241 B | application/x-cheetah | CheetahLexer
{header}
<title>Error</title>
<description>Error</description>
<item>
<title>Error</title>
<description>{error|escape}</description>
<guid>https://mercurial-scm.org/#error</guid>
</item>
</channel>
</rss>