Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 32047:458f7294dfee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: optionally strip quotes from merge marker template (BC) For consistency with the other template options. Quotes are necessary if you want to preserve leading/trailing whitespace, which would be stripped by config parser.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 25 Feb 2017 19:36:02 +0900
parents ac7aa96e4cd8
children 7d4ce4b567c5
comparison
equal deleted inserted replaced
32046:5b630f2ccb4e 32047:458f7294dfee
541 co = fco.changectx() 541 co = fco.changectx()
542 ca = fca.changectx() 542 ca = fca.changectx()
543 543
544 ui = repo.ui 544 ui = repo.ui
545 template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) 545 template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker)
546 template = templater.unquotestring(template)
546 tmpl = formatter.maketemplater(ui, 'conflictmarker', template) 547 tmpl = formatter.maketemplater(ui, 'conflictmarker', template)
547 548
548 pad = max(len(l) for l in labels) 549 pad = max(len(l) for l in labels)
549 550
550 newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), 551 newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad),