changeset 36991 | 317382151ac3 |
parent 36982 | a4a95bd7158d |
child 37001 | 3723b42ff953 |
--- 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)