diff -r 7f856606d5a9 -r 58b225aa4298 tests/test-evolve-interrupted.t --- a/tests/test-evolve-interrupted.t Fri Feb 28 23:23:02 2020 +0700 +++ b/tests/test-evolve-interrupted.t Sat Feb 29 15:17:13 2020 +0700 @@ -42,7 +42,7 @@ x 0 apricot - $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other + $ HGMERGE=internal:other hg evolve --update --config hooks.precommit=false --config ui.merge=internal:other move:[1] banana atop:[2] apricot and blueberry transaction abort! @@ -102,7 +102,7 @@ x 0 apricot - $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other + $ HGMERGE=internal:other hg evolve --update --config hooks.precommit=false --config ui.merge=:other move:[1] banana atop:[2] apricot and blueberry transaction abort! @@ -127,7 +127,7 @@ x 0 apricot - $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other + $ HGMERGE=internal:other hg evolve --update --config hooks.precommit=false --config ui.merge=:other move:[1] banana atop:[2] apricot and blueberry transaction abort!