--- a/mercurial/commands.py Wed Mar 30 09:49:45 2011 +0100
+++ b/mercurial/commands.py Fri Mar 11 20:43:12 2011 -0500
@@ -2989,7 +2989,10 @@
else:
ui.status(_("not updating, since new heads added\n"))
if modheads > 1:
- ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
+ if (len(repo.branchheads()) > 1):
+ ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
+ else:
+ ui.status(_("(run 'hg heads' to see heads)\n"))
else:
ui.status(_("(run 'hg update' to get a working copy)\n"))