tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 29 Oct 2006 13:08:10 +0100
changeset 3580 41989e55fa37
parent 2830 49988d9f0758
child 3592 fffc8a733bf9
permissions -rw-r--r--
allow update to switch to a different branch if the repo is clean

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