--- a/tests/test-up-local-change.out	Mon Mar 24 16:20:15 2008 +0100
+++ b/tests/test-up-local-change.out	Mon Mar 24 10:01:05 2008 -0500
@@ -103,7 +103,7 @@
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
-abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
+abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
 failed
 abort: outstanding uncommitted changes
 failed