Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 5025:7041869a1bf6
mq: add qnew --git option
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 28 Jul 2007 20:15:54 +0200 |
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