view tests/test-merge5.out @ 3277:23682d3e4111

disallow commands on non local repository
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 06 Oct 2006 19:21:43 +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