Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: drop extra white space
authorPierre-Yves David <pierre-yves.david@fb.com>
Tue, 05 Aug 2014 15:12:22 -0700
changeset 22025 5f22975d320d
parent 22024 372ae2745acf
child 22026 6966542768ff
filemerge: drop extra white space There should be no white space around the brace.
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- 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]))
hg-stable