Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 22025:5f22975d320d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f18830651811
children 6966542768ff
comparison
equal deleted inserted replaced
22024:372ae2745acf 22025:5f22975d320d
321 co = fco.changectx() 321 co = fco.changectx()
322 322
323 ui = repo.ui 323 ui = repo.ui
324 template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) 324 template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker)
325 template = templater.parsestring(template, quoted=False) 325 template = templater.parsestring(template, quoted=False)
326 tmpl = templater.templater(None, cache={ 'conflictmarker' : template }) 326 tmpl = templater.templater(None, cache={'conflictmarker': template})
327 327
328 pad = max(len(labels[0]), len(labels[1])) 328 pad = max(len(labels[0]), len(labels[1]))
329 329
330 return [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), 330 return [_formatconflictmarker(repo, cd, tmpl, labels[0], pad),
331 _formatconflictmarker(repo, co, tmpl, labels[1], pad)] 331 _formatconflictmarker(repo, co, tmpl, labels[1], pad)]