Mercurial > hg-stable

diff mercurial/localrepo.py @ 1995:2da2d46862fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Spelling fix: "commited" -> "committed"
author mcmillen@cs.cmu.edu
date Fri, 24 Mar 2006 14:53:23 +0100
parents 719cf07b076d
children 65cc17ae9649
line wrap: on
line diff
--- 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: