tests/test-merge5.out

--- a/tests/test-merge5.out	Mon Mar 24 16:20:15 2008 +0100
+++ b/tests/test-merge5.out	Mon Mar 24 10:01:05 2008 -0500
@@ -2,6 +2,6 @@
 removing b
 created new head
 % should abort
-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)
 % should succeed
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+abort: crosses branches (use 'hg merge'or 'hg update -C')