Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 3270:36fa5db79dd5
hgweb: convert gitweb to NWI
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 05 Oct 2006 14:27:14 -0700 |
parents | 49988d9f0758 |
children | 41989e55fa37 |
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