Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 3918:5f0e00224cde
Adjust test-help output for the change in 3c82ab166eea.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 16 Dec 2006 23:33:24 +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