Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 5048:8db8e1100f3f
Update asciidoc instructions to suggest html4 for newer versions
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Wed, 01 Aug 2007 14:32:05 -0700 |
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