tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 26 Dec 2006 00:40:28 +0100
changeset 3968 033082ba1d1a
parent 3592 fffc8a733bf9
permissions -rw-r--r--
archival.py: use contexts

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