Mercurial Mercurial > mercurial / 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.
merge: whitespace cleanup
authorPeter Arrenbrecht <peter.arrenbrecht@gmail.com>
Wed, 27 May 2009 16:25:31 +0200
changeset 8636 7aa1526d4fc5
parent 8635 aaaf4af1c173
child 8637 c88c8d59979f
merge: whitespace cleanup
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Wed May 27 14:11:41 2009 +0200
+++ b/mercurial/commands.py	Wed May 27 16:25:31 2009 +0200
@@ -2089,7 +2089,7 @@
         roots, heads = [common.node()], [p2.node()]
         displayer = cmdutil.show_changeset(ui, repo, opts)
         for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]:
-        	displayer.show(repo[node])
+            displayer.show(repo[node])
         return 0
 
     return hg.merge(repo, node, force=opts.get('force'))
mercurial