##// END OF EJS Templates
Spelling fix: "commited" -> "committed"
mcmillen@cs.cmu.edu -
r1995:2da2d468 default
parent child Browse files
Show More
@@ -1030,7 +1030,7 b' def commit(ui, repo, *pats, **opts):'
1030 Commit changes to the given files into the repository.
1030 Commit changes to the given files into the repository.
1031
1031
1032 If a list of files is omitted, all changes reported by "hg status"
1032 If a list of files is omitted, all changes reported by "hg status"
1033 will be commited.
1033 will be committed.
1034
1034
1035 The HGEDITOR or EDITOR environment variables are used to start an
1035 The HGEDITOR or EDITOR environment variables are used to start an
1036 editor to add a commit comment.
1036 editor to add a commit comment.
@@ -1441,7 +1441,7 b' class localrepository(object):'
1441 "just use 'hg update'"))
1441 "just use 'hg update'"))
1442 if allow and not forcemerge:
1442 if allow and not forcemerge:
1443 if modified or added or removed:
1443 if modified or added or removed:
1444 raise util.Abort(_("outstanding uncommited changes"))
1444 raise util.Abort(_("outstanding uncommitted changes"))
1445 if not forcemerge and not force:
1445 if not forcemerge and not force:
1446 for f in unknown:
1446 for f in unknown:
1447 if f in m2:
1447 if f in m2:
@@ -8,12 +8,12 b' merging b'
8 Contents of b should be "this is file b1"
8 Contents of b should be "this is file b1"
9 This is file b1
9 This is file b1
10 %% merge fails
10 %% merge fails
11 abort: outstanding uncommited changes
11 abort: outstanding uncommitted changes
12 %% merge expected!
12 %% merge expected!
13 merging for b
13 merging for b
14 merging b
14 merging b
15 %% merge of b should fail
15 %% merge of b should fail
16 abort: outstanding uncommited changes
16 abort: outstanding uncommitted changes
17 %% merge of b expected
17 %% merge of b expected
18 merging for b
18 merging for b
19 merging b
19 merging b
@@ -103,7 +103,7 b' this update spans a branch affecting the'
103 aborting update spanning branches!
103 aborting update spanning branches!
104 (use update -m to merge across branches or -C to lose changes)
104 (use update -m to merge across branches or -C to lose changes)
105 failed
105 failed
106 abort: outstanding uncommited changes
106 abort: outstanding uncommitted changes
107 failed
107 failed
108 resolving manifests
108 resolving manifests
109 force None allow 1 moddirstate True linear False
109 force None allow 1 moddirstate True linear False
General Comments 0
You need to be logged in to leave comments. Login now