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