Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge5.out @ 2178:00205fe76993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 02 May 2006 14:38:32 -0700
parents b2ae81a7df29
children 49988d9f0758
comparison
equal deleted inserted replaced
2177:6886bc0b77af 2178:00205fe76993
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 removing b 2 removing b
2 this update spans a branch affecting the following files: 3 this update spans a branch affecting the following files:
3 b 4 b
4 aborting update spanning branches! 5 aborting update spanning branches!
5 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) 6 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)