Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 4295:a74586023196
test-merge6: avoid a shell script
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 27 Mar 2007 01:41:18 -0300 |
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