Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 3834:a7b61c3b0f93
Removed unknown option -t in test-status
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 08 Dec 2006 23:33:32 +0100 |
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