Mercurial > hg
comparison tests/library-infinitepush.sh @ 40465:1736450cd1df
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.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Wed, 31 Oct 2018 19:12:32 +0100 |
| parents | 03ff17a4bf53 |
| children | 0826d684a1b5 |
comparison
equal
deleted
inserted
replaced
| 40464:37e75be0b019 | 40465:1736450cd1df |
|---|