# HG changeset patch
# User Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
# Date 2009-05-27 14:25:31
# Node ID 7aa1526d4fc5518af3ab27049577daeef22b9bb1
# Parent  aaaf4af1c1730a38a81bab92d7f4bc254a4d848e

merge: whitespace cleanup

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2089,7 +2089,7 @@ 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'))