Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 3934:a33ddd20105c
hgk - fix CR issues on windows
author | "Andrei Vermel <avermel@mail.ru>" |
---|---|
date | Fri, 15 Dec 2006 10:32:57 +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