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

r9999:f91e5630 default
r40500:37e75be0 default
Show More
coal-folder.png
0 lines | 284 B | image/png | TextLexer
/ mercurial / templates / static / coal-folder.png
rendered-image