Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
changeset 15618 0aca2695a110
parent 15614 260a6449d83a
child 15619 6c8573dd1b6b 
--- a/mercurial/commands.py	Wed Dec 07 12:56:44 2011 +0100
+++ b/mercurial/commands.py	Wed Dec 07 11:22:57 2011 -0600
@@ -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)
mercurial