--- a/mercurial/filemerge.py Fri Dec 22 21:22:49 2017 +0900
+++ b/mercurial/filemerge.py Fri Dec 22 21:19:29 2017 +0900
@@ -552,8 +552,7 @@
if ctx.node() is None:
ctx = ctx.p1()
- props = templatekw.keywords.copy()
- props['ctx'] = ctx
+ props = {'ctx': ctx}
templateresult = template.render(props)
label = ('%s:' % label).ljust(pad + 1)
@@ -580,7 +579,8 @@
template = ui.config('ui', 'mergemarkertemplate')
template = templater.unquotestring(template)
tres = formatter.templateresources(ui, repo)
- tmpl = formatter.maketemplater(ui, template, resources=tres)
+ tmpl = formatter.maketemplater(ui, template, defaults=templatekw.keywords,
+ resources=tres)
pad = max(len(l) for l in labels)