[PATCH 1 of 6] merge: remove excess creation of changectx

[Kevin Bullock]

# HG changeset patch
# User Kevin Bullock <kbullock at ringworld.org>
# Date 1323278577 21600
# Node ID d5d6040f22faacd004ed447536e252e9fb610985
# Parent  ec8a49c46d7e5f90c0c440bbd76fcf81ec00f359
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 @@
                                  % 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)