# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 2011-12-07 17:22:57
# Node ID 0aca2695a1108cfd70e912fecee6aa477b22f00c
# Parent  74e691b141c40af594e372276d155db450a5e9ce

merge: remove excess creation of changectx

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4043,7 +4043,7 @@ def merge(ui, repo, node=None, **opts):
                                  % branch,
                                  hint=_("run 'hg heads' to see all heads"))
             msg = _('there is nothing to merge')
-            if parent != repo.lookup(repo[None].branch()):
+            if parent != repo.lookup(branch):
                 msg = _('%s - use "hg update" instead') % msg
             raise util.Abort(msg)