Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 4039:55578a8d7e84
mq: allow push if -r is given explicitly
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 22 Jan 2007 20:22:25 -0800 |
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