Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 5456:a58d415b272e
fix typo
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Thu, 11 Oct 2007 16:28:30 +0200 |
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