mercurial/filemerge.py

--- a/mercurial/filemerge.py	Tue Apr 14 12:45:15 2015 -0700
+++ b/mercurial/filemerge.py	Mon May 04 10:01:03 2015 +0900
@@ -354,7 +354,6 @@
 
     ui = repo.ui
     template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker)
-    template = templater.parsestring(template, quoted=False)
     tmpl = templater.templater(None, cache={'conflictmarker': template})
 
     pad = max(len(l) for l in labels)