Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 4802:7549cd526b7f
Fix serve on Windows without win32* modules.
author | Nathan Jones <nathanj@insightbb.com> |
---|---|
date | Tue, 26 Jun 2007 10:48:58 -0400 |
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