tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 31 Oct 2006 13:02:49 +0100
changeset 3592 fffc8a733bf9
parent 3580 41989e55fa37
permissions -rw-r--r--
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140

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