Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change.out @ 1995:2da2d46862fb
Spelling fix: "commited" -> "committed"
author | mcmillen@cs.cmu.edu |
---|---|
date | Fri, 24 Mar 2006 14:53:23 +0100 |
parents | 7544700fd931 |
children | ced2d3620f95 |
line wrap: on
line diff
--- 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