Mercurial > hg
view tests/test-merge5.out @ 2932:d77022db1bca
Solaris portability fixes
author | Danek Duvall <danek.duvall@sun.com> |
---|---|
date | Fri, 18 Aug 2006 10:24:04 -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