Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 5432:0d154bce2341
osutil: Solaris build fix
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 09 Oct 2007 08:39:37 -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