# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1216639071 -7200
# Node ID a38dff85d31fb01827909d17b0c5419cc853132c
# Parent  b114a8c7998f65e5f56a858ee5ddc845072dc01a
merge: use correct branch name for counting heads

diff -r b114a8c7998f -r a38dff85d31f mercurial/commands.py
--- a/mercurial/commands.py	Fri Jul 25 13:27:06 2008 +0200
+++ b/mercurial/commands.py	Mon Jul 21 13:17:51 2008 +0200
@@ -1882,7 +1882,7 @@
 
     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") %