diff -r f8154ddaaed3 -r d6b6f1b441cf tests/test-commandserver.t
--- a/tests/test-commandserver.t	Fri Oct 19 01:52:16 2018 +0200
+++ b/tests/test-commandserver.t	Thu Nov 01 14:29:21 2018 +0100
@@ -211,6 +211,7 @@
   lfs.usercache=$TESTTMP/.cache/lfs
   ui.slash=True
   ui.interactive=False
+  ui.merge=internal:merge
   ui.mergemarkers=detailed
   ui.foo=bar
   ui.nontty=true
@@ -221,6 +222,7 @@
   *** runcommand -R foo showconfig ui defaults
   ui.slash=True
   ui.interactive=False
+  ui.merge=internal:merge
   ui.mergemarkers=detailed
   ui.nontty=true
 #endif