tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 24 Aug 2007 00:56:08 +0200
changeset 5219 74723744d8e0
parent 3592 fffc8a733bf9
permissions -rw-r--r--
fix test-permissions output

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