Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 24987:fd7287f0b43c
templater: remove noop calls of parsestring(s, quoted=False) (API)
Since db7463aa080f, parsestring(s, quoted=False) just returns s.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Mon, 04 May 2015 10:01:03 +0900 |
| parents | 5668202cfaaf |
| children | 34ffe4c29782 |
line wrap: on
line diff
--- a/mercurial/filemerge.py Tue Apr 14 12:45:15 2015 -0700 +++ b/mercurial/filemerge.py Mon May 04 10:01:03 2015 +0900 @@ -354,7 +354,6 @@ ui = repo.ui template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) - template = templater.parsestring(template, quoted=False) tmpl = templater.templater(None, cache={'conflictmarker': template}) pad = max(len(l) for l in labels)