Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 32047:458f7294dfee
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 |
line wrap: on
line diff
--- a/mercurial/filemerge.py Sat Feb 25 19:32:39 2017 +0900 +++ b/mercurial/filemerge.py Sat Feb 25 19:36:02 2017 +0900 @@ -543,6 +543,7 @@ ui = repo.ui template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) + template = templater.unquotestring(template) tmpl = formatter.maketemplater(ui, 'conflictmarker', template) pad = max(len(l) for l in labels)