diff -r ac3b3a2d976d -r 10abc3a5c6b2 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Thu Jul 17 20:17:17 2014 -0400
+++ b/mercurial/filemerge.py	Sun Jul 06 02:56:41 2014 +0900
@@ -376,7 +376,7 @@
 
     ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
 
-    markerstyle = ui.config('ui', 'mergemarkers', 'detailed')
+    markerstyle = ui.config('ui', 'mergemarkers', 'basic')
     if markerstyle == 'basic':
         formattedlabels = _defaultconflictlabels
     else: