--- a/mercurial/filemerge.py	Tue Aug 05 15:10:50 2014 -0700
+++ b/mercurial/filemerge.py	Tue Aug 05 15:12:22 2014 -0700
@@ -323,7 +323,7 @@
     ui = repo.ui
     template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker)
     template = templater.parsestring(template, quoted=False)
-    tmpl = templater.templater(None, cache={ 'conflictmarker' : template })
+    tmpl = templater.templater(None, cache={'conflictmarker': template})
 
     pad = max(len(labels[0]), len(labels[1]))