--- a/mercurial/commands.py Fri Mar 24 08:51:08 2006 +0100
+++ b/mercurial/commands.py Fri Mar 24 14:53:23 2006 +0100
@@ -1030,7 +1030,7 @@
Commit changes to the given files into the repository.
If a list of files is omitted, all changes reported by "hg status"
- will be commited.
+ will be committed.
The HGEDITOR or EDITOR environment variables are used to start an
editor to add a commit comment.
--- 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:
--- a/tests/test-merge1.out Fri Mar 24 08:51:08 2006 +0100
+++ b/tests/test-merge1.out Fri Mar 24 14:53:23 2006 +0100
@@ -8,12 +8,12 @@
Contents of b should be "this is file b1"
This is file b1
%% merge fails
-abort: outstanding uncommited changes
+abort: outstanding uncommitted changes
%% merge expected!
merging for b
merging b
%% merge of b should fail
-abort: outstanding uncommited changes
+abort: outstanding uncommitted changes
%% merge of b expected
merging for b
merging b
--- a/tests/test-up-local-change.out Fri Mar 24 08:51:08 2006 +0100
+++ b/tests/test-up-local-change.out Fri Mar 24 14:53:23 2006 +0100
@@ -103,7 +103,7 @@
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)
failed
-abort: outstanding uncommited changes
+abort: outstanding uncommitted changes
failed
resolving manifests
force None allow 1 moddirstate True linear False