diff -r f4065c3f09b8 -r 9dc1351d0b5f tests/test-merge1.t
--- a/tests/test-merge1.t	Mon Nov 16 10:56:54 2020 -0800
+++ b/tests/test-merge1.t	Fri Nov 20 14:43:21 2020 -0800
@@ -138,7 +138,7 @@
 
 bad config
   $ hg merge 1 --config merge.checkunknown=x
-  abort: merge.checkunknown not valid ('x' is none of 'abort', 'ignore', 'warn')
+  config error: merge.checkunknown not valid ('x' is none of 'abort', 'ignore', 'warn')
   [30]
 this merge should fail
   $ hg merge 1 --config merge.checkunknown=abort