Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 4838:9a45e1597d08
Merge with crew
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sat, 07 Jul 2007 15:09:28 -0700 |
parents | fffc8a733bf9 |
children |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes