Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 3873:a41b01a3c29f
Fix test output for test-mq-guards (changed by 22d18051f9e5)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 12 Dec 2006 19:11:01 +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