Mercurial > hg

diff tests/test-merge5.out @ 824:0932bc2fb2be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with BOS
author mpm@selenic.com
date Tue, 02 Aug 2005 08:57:32 -0800
parents 0902ffece4b4 77e121a0d870
children 1fe3b14c7044 9c918287d10b
line wrap: on
line diff
--- 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)