--- a/tests/test-casecollision-merge.t Mon Sep 23 20:08:52 2013 -0700
+++ b/tests/test-casecollision-merge.t Mon Sep 23 20:33:02 2013 -0700
@@ -293,7 +293,7 @@
[255]
$ hg update --check
- abort: uncommitted local changes
+ abort: uncommitted changes
[255]
$ hg update --clean