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

r24588:0bf54479 default
r40500:37e75be0 default
Show More
changelist.tmpl
5 lines | 124 B | application/x-cheetah | CheetahLexer
Gregory Szorc
json: implement {shortlog} and {changelog} templates...
r24588 \{
"node": {node|json},
"changeset_count": {changesets|json},
"changesets": [{join(entries%changelistentry, ", ")}]
}