Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 4339:077aafddd35f
Merge with crew-stable
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 12 Apr 2007 15:07: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