--- a/mercurial/cmdutil.py	Tue May 05 14:45:09 2015 -0400
+++ b/mercurial/cmdutil.py	Tue Apr 14 12:45:15 2015 -0700
@@ -2721,7 +2721,7 @@
         edittext.append(_("HG: branch merge"))
     if ctx.branch():
         edittext.append(_("HG: branch '%s'") % ctx.branch())
-    if bookmarks.iscurrent(repo):
+    if bookmarks.isactivewdirparent(repo):
         edittext.append(_("HG: bookmark '%s'") % repo._activebookmark)
     edittext.extend([_("HG: subrepo %s") % s for s in subs])
     edittext.extend([_("HG: added %s") % f for f in added])