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