tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 27 Nov 2006 22:22:44 +0100
changeset 3713 8ae88ed2a3b6
parent 3592 fffc8a733bf9
permissions -rw-r--r--
don't create the .hg/data at init time

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