Thu, 01 Nov 2018 14:35:18 +0100 |
Boris Feld |
test: remove changes preparing the drop of `HGMERGE`
|
Thu, 01 Nov 2018 14:29:21 +0100 |
Boris Feld |
run-tests: define the default merge tool through configuration
|
Fri, 19 Oct 2018 01:52:16 +0200 |
Boris Feld |
run-tests: explicitly declare the list of dropped environment variable
|
Thu, 01 Nov 2018 14:29:14 +0100 |
Boris Feld |
test: drop usage of `HGMERGE` in `test-lfconvert.t`
|
Thu, 01 Nov 2018 14:26:30 +0100 |
Boris Feld |
test: drop usage of `HGMERGE` in `test-merge-types.t`
|
Thu, 01 Nov 2018 14:24:34 +0100 |
Boris Feld |
test: use the "correct" merge tool in `test-rebase-detach.t`
|
Wed, 31 Oct 2018 19:12:32 +0100 |
Boris Feld |
test: also deactivate `ui.merge` when testing merge tool
|
Wed, 31 Oct 2018 18:43:56 +0100 |
Boris Feld |
tests: adjust merge tool config in test-largefiles-update.t
|