Mercurial Mercurial > hg / 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 17388 54feb8d3bab7
parent 17376 3738d6254bd3
parent 17386 45b5eb2941d0
child 17393 99a2a4ae35e2 
--- a/mercurial/commands.py	Fri Aug 24 14:52:45 2012 -0500
+++ b/mercurial/commands.py	Fri Aug 24 14:53:07 2012 -0500
@@ -4269,7 +4269,7 @@
                              hint=_("run 'hg heads .' to see heads"))
 
         parent = repo.dirstate.p1()
-        if len(nbhs) == 1:
+        if len(nbhs) <= 1:
             if len(bheads) > 1:
                 raise util.Abort(_("heads are bookmarked - "
                                    "please merge with an explicit rev"),
Mercurial