comparison tests/test-bdiff.py @ 41250:37e75be0b019

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.
author Boris Feld <boris.feld@octobus.net>
date Wed, 31 Oct 2018 18:43:56 +0100
parents e961f18a0094
children 2372284d9457
comparison
equal deleted inserted replaced
41249:cfa564037789 41250:37e75be0b019