Mercurial > hg
changeset 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 03 Jul 2006 19:14:29 +0200 |
| parents | d75c68b55af8 |
| children | 764a54eb8c5a |
| files | mercurial/localrepo.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Fri Jun 30 22:04:02 2006 -0700 +++ b/mercurial/localrepo.py Mon Jul 03 19:14:29 2006 +0200 @@ -1643,8 +1643,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"))