changeset 1995 | 2da2d46862fb |
parent 1986 | 719cf07b076d |
child 1998 | 65cc17ae9649 |
--- a/mercurial/localrepo.py Fri Mar 24 08:51:08 2006 +0100 +++ b/mercurial/localrepo.py Fri Mar 24 14:53:23 2006 +0100 @@ -1441,7 +1441,7 @@ "just use 'hg update'")) if allow and not forcemerge: if modified or added or removed: - raise util.Abort(_("outstanding uncommited changes")) + raise util.Abort(_("outstanding uncommitted changes")) if not forcemerge and not force: for f in unknown: if f in m2: