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

r29435:b8ede1f7 default
r40502:b57f2734 default
Show More
bookmarks.tmpl
6 lines | 163 B | application/x-cheetah | CheetahLexer
{header}
<title>{repo|escape}: bookmarks</title>
<description>{repo|escape} bookmark history</description>
{entries%bookmarkentry}
</channel>
</rss>