##// END OF EJS Templates
tests: adjust merge tool config in test-largefiles-update.t...
tests: adjust merge tool config in test-largefiles-update.t Previously, the `ui.merge=internal:fail` configuration was shadowed by the the `HGMERGE=internal:merge` environment variable. We would like to remove this usage of `HGMERGE` variable because it is error-prone (eg: this very test). We start by cleaning up test independently to avoid large churn when the change happens.

File last commit:

r29435:b8ede1f7 default
r40500:37e75be0 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>