tests/test-merge5.out

--- a/tests/test-merge5.out	Sun Apr 02 08:19:41 2006 +0200
+++ b/tests/test-merge5.out	Sun Apr 02 18:16:06 2006 +0200
@@ -2,4 +2,4 @@
 this update spans a branch affecting the following files:
  b
 aborting update spanning branches!
-(use 'hg merge' to merge across branches or '-C' to lose changes)
+(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)