Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-basic.t
changeset 40470 d6b6f1b441cf
parent 40369 ef6cab7930b3
child 40547 840cd57cde32 
--- 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
Mercurial