merge: whitespace cleanup

mercurial/commands.py

@@ -2089,7 +2089,7 b' def merge(ui, repo, node=None, **opts):'
         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'))