Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
2829:4870f795f681 2830:49988d9f0758
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 removing b 2 removing b
3 this update spans a branch affecting the following files: 3 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
4 b
5 aborting update spanning branches!
6 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)