diff -r f97a0bcfd7a1 -r 78759f78a44e mercurial/filemerge.py
--- a/mercurial/filemerge.py	Sun Apr 03 23:26:48 2016 +0900
+++ b/mercurial/filemerge.py	Sun Apr 10 17:23:09 2016 +0900
@@ -17,6 +17,7 @@
 
 from . import (
     error,
+    formatter,
     match,
     scmutil,
     simplemerge,
@@ -526,7 +527,7 @@
 
     ui = repo.ui
     template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker)
-    tmpl = templater.templater(cache={'conflictmarker': template})
+    tmpl = formatter.maketemplater(ui, 'conflictmarker', template)
 
     pad = max(len(l) for l in labels)