changeset 2551 | 764a54eb8c5a |
parent 2549 | e1831f06eef1 |
parent 2548 | 0229ff95faec |
child 2567 | 2748253b49c2 |
--- a/mercurial/localrepo.py Mon Jul 03 10:18:46 2006 -0700 +++ b/mercurial/localrepo.py Mon Jul 03 10:19:09 2006 -0700 @@ -1645,8 +1645,8 @@ linear_path = (pa == p1 or pa == p2) if allow and linear_path: - raise util.Abort(_("there is nothing to merge, " - "just use 'hg update'")) + raise util.Abort(_("there is nothing to merge, just use " + "'hg update' or look at 'hg heads'")) if allow and not forcemerge: if modified or added or removed: raise util.Abort(_("outstanding uncommitted changes"))