--- a/tests/test-issue522.t	Fri Oct 10 13:05:50 2014 -0500
+++ b/tests/test-issue522.t	Fri Oct 10 13:31:06 2014 -0500
@@ -38,7 +38,7 @@
   (branch merge, don't forget to commit)
 
   $ hg debugstate | grep foo
-  n   0         -2 unset               foo
+  m   0         -2 unset               foo
 
   $ hg st -A foo
   M foo