Mercurial > hg
view tests/test-merge5.out @ 2843:0b9ac7dfcf56
Fix some tests for portability.
author | Danek Duvall <danek.duvall@sun.com> |
---|---|
date | Wed, 09 Aug 2006 12:05:40 -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