mercurial/filemerge.py

--- a/mercurial/filemerge.py	Sat Mar 17 15:22:14 2018 +0900
+++ b/mercurial/filemerge.py	Sat Mar 17 11:23:04 2018 +0900
@@ -563,7 +563,7 @@
         ctx = ctx.p1()
 
     props = {'ctx': ctx}
-    templateresult = template.render(props)
+    templateresult = template.renderdefault(props)
 
     label = ('%s:' % label).ljust(pad + 1)
     mark = '%s %s' % (label, templateresult)