# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1122859875 28800
# Node ID 77e121a0d87001e52e03adaed1c29e7e4bd21e4b
# Parent  5a55e3011772f8b593cd666e3291e45f646a8656
Update output for test-merge5.


diff -r 5a55e3011772 -r 77e121a0d870 tests/test-merge5.out
--- 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)