--- a/tests/test-merge5.out	Sun Oct 29 13:08:10 2006 +0100
+++ b/tests/test-merge5.out	Tue Oct 31 13:02:49 2006 +0100
@@ -1,4 +1,3 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 removing b
-abort: outstanding uncommited changes, use 'hg update -C' to lose changes
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes