diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1030,7 +1030,7 @@ def commit(ui, repo, *pats, **opts): 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. diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -1441,7 +1441,7 @@ class localrepository(object): "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: diff --git a/tests/test-merge1.out b/tests/test-merge1.out --- a/tests/test-merge1.out +++ b/tests/test-merge1.out @@ -8,12 +8,12 @@ merging b 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 diff --git a/tests/test-up-local-change.out b/tests/test-up-local-change.out --- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -103,7 +103,7 @@ this update spans a branch affecting the 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