Mercurial > hg > gitweb

diff tests/test-merge5.out @ 2830:49988d9f0758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew, fix most tests
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Aug 2006 13:55:18 -0500
parents b2ae81a7df29
children 41989e55fa37
line wrap: on
line diff
--- a/tests/test-merge5.out	Tue Aug 08 10:56:48 2006 -0500
+++ b/tests/test-merge5.out	Wed Aug 09 13:55:18 2006 -0500
@@ -1,6 +1,3 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 removing b
-this update spans a branch affecting the following files:
- b
-aborting update spanning branches!
-(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)
+abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes