changeset 824 | 0932bc2fb2be |
parent 814 | 0902ffece4b4 |
parent 819 | 77e121a0d870 |
child 836 | 1fe3b14c7044 |
child 839 | 9c918287d10b |
--- a/tests/test-merge5.out Mon Aug 01 23:34:23 2005 -0800 +++ b/tests/test-merge5.out Tue Aug 02 08:57:32 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)