diff -r 8cebb59ee4e2 -r 877e05b46509 mercurial/discovery.py --- a/mercurial/discovery.py Sat Nov 16 15:46:29 2013 -0500 +++ b/mercurial/discovery.py Sat Nov 16 15:46:29 2013 -0500 @@ -313,8 +313,8 @@ if 1 < len(newhs): dhs = list(newhs) if error is None: - error = (_("push creates multiple headed new branch '%s'") - % (branch)) + error = (_("push creates new branch '%s' " + "with multiple heads") % (branch)) hint = _("merge or" " see \"hg help push\" for details about" " pushing new heads")