equal
deleted
inserted
replaced
524 co = fco.changectx() |
524 co = fco.changectx() |
525 ca = fca.changectx() |
525 ca = fca.changectx() |
526 |
526 |
527 ui = repo.ui |
527 ui = repo.ui |
528 template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) |
528 template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) |
529 tmpl = templater.templater(None, cache={'conflictmarker': template}) |
529 tmpl = templater.templater(cache={'conflictmarker': template}) |
530 |
530 |
531 pad = max(len(l) for l in labels) |
531 pad = max(len(l) for l in labels) |
532 |
532 |
533 newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), |
533 newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), |
534 _formatconflictmarker(repo, co, tmpl, labels[1], pad)] |
534 _formatconflictmarker(repo, co, tmpl, labels[1], pad)] |