--- a/tests/test-merge5.t Mon Sep 23 20:08:52 2013 -0700
+++ b/tests/test-merge5.t Mon Sep 23 20:33:02 2013 -0700
@@ -19,7 +19,7 @@
[255]
$ rm b
$ hg update -c
- abort: uncommitted local changes
+ abort: uncommitted changes
[255]
$ hg revert b
$ hg update -c