Mercurial > hg
view tests/test-merge5.out @ 3322:a1aad25ccc3e
fix localrepo.status when dealing with x-bit changes
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 10 Oct 2006 00:02:30 +0200 |
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