Mercurial > hg
view tests/test-merge5.out @ 3592:fffc8a733bf9
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 31 Oct 2006 13:02:49 +0100 |
parents | 41989e55fa37 |
children | 4b0c9c674707 |
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