Mercurial > hg
changeset 22025:5f22975d320d
filemerge: drop extra white space
There should be no white space around the brace.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 05 Aug 2014 15:12:22 -0700 |
| parents | 372ae2745acf |
| children | 6966542768ff |
| files | mercurial/filemerge.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Tue Aug 05 15:10:50 2014 -0700 +++ b/mercurial/filemerge.py Tue Aug 05 15:12:22 2014 -0700 @@ -323,7 +323,7 @@ ui = repo.ui template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) template = templater.parsestring(template, quoted=False) - tmpl = templater.templater(None, cache={ 'conflictmarker' : template }) + tmpl = templater.templater(None, cache={'conflictmarker': template}) pad = max(len(labels[0]), len(labels[1]))