Comments
Patch
@@ -321,11 +321,11 @@ def _formatlabels(repo, fcd, fco, labels
co = fco.changectx()
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]))
return [_formatconflictmarker(repo, cd, tmpl, labels[0], pad),
_formatconflictmarker(repo, co, tmpl, labels[1], pad)]