Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 4721:96614af3c679
convert: "unknown" is a string
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 25 Jun 2007 18:52:12 -0300 |
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