Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 5468:24eb1bf8dd83
mq.el: define keymaps as convensions
author | NIIMI Satoshi <sa2c@sa2c.net> |
---|---|
date | Thu, 11 Oct 2007 06:13:17 +0900 |
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