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

r19429:c8490dcc default
r40500:37e75be0 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}