Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 2346:925610b2d90a
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 24 May 2006 09:27:16 +0200 |
parents | b2ae81a7df29 |
children | 49988d9f0758 |
line wrap: on
line source
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)