tests/test-merge5.out

--- a/tests/test-merge5.out	Wed Mar 29 12:45:33 2006 +0200
+++ b/tests/test-merge5.out	Wed Mar 29 10:27:16 2006 -0800
@@ -2,4 +2,4 @@
 this update spans a branch affecting the following files:
  b
 aborting update spanning branches!
-(use update -m to merge across branches or -C to lose changes)
+(use 'hg merge' to merge across branches or '-C' to lose changes)