--- a/tests/test-up-local-change.t	Sat Oct 09 17:58:48 2010 -0500
+++ b/tests/test-up-local-change.t	Sat Oct 09 17:02:28 2010 -0500
@@ -167,7 +167,7 @@
   summary:     2
   
   $ hg --debug up
-  abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
+  abort: crosses branches (merge branches or use --clean to discard changes)
   [255]
   $ hg --debug merge
   abort: outstanding uncommitted changes (use 'hg status' to list changes)