changeset 28954 | f97a0bcfd7a1 |
parent 28640 | 4fc640fd0026 |
child 28955 | 78759f78a44e |
--- a/mercurial/filemerge.py Sun Apr 03 23:18:30 2016 +0900 +++ b/mercurial/filemerge.py Sun Apr 03 23:26:48 2016 +0900 @@ -526,7 +526,7 @@ ui = repo.ui template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) - tmpl = templater.templater(None, cache={'conflictmarker': template}) + tmpl = templater.templater(cache={'conflictmarker': template}) pad = max(len(l) for l in labels)