equal
deleted
inserted
replaced
352 co = fco.changectx() |
352 co = fco.changectx() |
353 ca = fca.changectx() |
353 ca = fca.changectx() |
354 |
354 |
355 ui = repo.ui |
355 ui = repo.ui |
356 template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) |
356 template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) |
357 template = templater.parsestring(template, quoted=False) |
|
358 tmpl = templater.templater(None, cache={'conflictmarker': template}) |
357 tmpl = templater.templater(None, cache={'conflictmarker': template}) |
359 |
358 |
360 pad = max(len(l) for l in labels) |
359 pad = max(len(l) for l in labels) |
361 |
360 |
362 newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), |
361 newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), |