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

r19429:c8490dcc default
r40501:1736450c default
Show More
logentry.tmpl
6 lines | 172 B | application/x-cheetah | CheetahLexer
Alexander Plavin
hgweb: add changelog and search templates to raw style...
r19429 changeset: {node}
revision: {rev}
user: {author}
date: {date|rfc822date}
summary: {desc}
{branches%branchname}{tags%tagname}{bookmarks%bookmarkname}