--- a/tests/test-merge5.out	Sat Jul 30 09:01:59 2005 -0800
+++ b/tests/test-merge5.out	Sun Jul 31 17:31:15 2005 -0800
@@ -9,4 +9,4 @@
 this update spans a branch affecting the following files:
  b
 aborting update spanning branches!
-(use update -m to perform a branch merge)
+(use update -m to merge across branches or -C to lose changes)