--- a/tests/test-basic.t Fri Oct 19 01:52:16 2018 +0200
+++ b/tests/test-basic.t Thu Nov 01 14:29:21 2018 +0100
@@ -9,6 +9,7 @@
lfs.usercache=$TESTTMP/.cache/lfs
ui.slash=True
ui.interactive=False
+ ui.merge=internal:merge
ui.mergemarkers=detailed
ui.promptecho=True
web.address=localhost