Show More
| @@ -323,7 +323,7 b' def _formatlabels(repo, fcd, fco, labels' | |||
|
|
323 | 323 | ui = repo.ui |
|
|
324 | 324 | template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) |
|
|
325 | 325 | template = templater.parsestring(template, quoted=False) |
|
|
326 |
tmpl = templater.templater(None, cache={ |
|
|
|
326 | tmpl = templater.templater(None, cache={'conflictmarker': template}) | |
|
|
327 | 327 | |
|
|
328 | 328 | pad = max(len(labels[0]), len(labels[1])) |
|
|
329 | 329 | |
General Comments 0
You need to be logged in to leave comments.
Login now