# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 2008-07-21 11:17:51
# Node ID a38dff85d31fb01827909d17b0c5419cc853132c
# Parent  b114a8c7998f65e5f56a858ee5ddc845072dc01a

merge: use correct branch name for counting heads

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1882,7 +1882,7 @@ def merge(ui, repo, node=None, force=Non
 
     if not node:
         branch = repo.changectx(None).branch()
-        bheads = repo.branchheads()
+        bheads = repo.branchheads(branch)
         if len(bheads) > 2:
             raise util.Abort(_("branch '%s' has %d heads - "
                                "please merge with an explicit rev") %