view tests/test-merge5.out @ 3580:41989e55fa37

allow update to switch to a different branch if the repo is clean
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 29 Oct 2006 13:08:10 +0100
parents 49988d9f0758
children fffc8a733bf9
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: outstanding uncommited changes, use 'hg update -C' to lose changes
1 files updated, 0 files merged, 0 files removed, 0 files unresolved