diff --git a/tests/test-conflict.out b/tests/test-conflict.out
--- a/tests/test-conflict.out
+++ b/tests/test-conflict.out
@@ -20,5 +20,5 @@ something else
 =======
 something
 + hg status
-C a
+M a
 ? .out
diff --git a/tests/test-tags.out b/tests/test-tags.out
--- a/tests/test-tags.out
+++ b/tests/test-tags.out
@@ -24,7 +24,7 @@ first                              0:acb
 b9154636be93 tip
 + echo bb
 + hg status
-C a
+M a
 + hg identify
 b9154636be93+ tip
 + hg co first
@@ -33,7 +33,7 @@ acb14030fe0a+ first
 + hg -v id
 acb14030fe0a21b60322c440ad2d20cf7685a376+ first
 + hg status
-C a
+M a
 + echo 1
 + hg add b
 + hg commit -t branch -u test -d '0 0'
@@ -43,5 +43,5 @@ c8edf04160c7 tip
 + hg id
 c8edf04160c7+b9154636be93+ tip
 + hg status
-C .hgtags
-C a
+M .hgtags
+M a
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
@@ -24,7 +24,7 @@ diff -r c19d34741b0a a
 + cd ../r2
 + hg -q pull ../r1
 + hg status
-C a
+M a
 + hg --debug up
 resolving manifests
  force None allow None moddirstate True linear True