tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 30 Aug 2007 23:54:01 +0200
changeset 5268 fae670ee6c6d
parent 3592 fffc8a733bf9
permissions -rw-r--r--
kill lonely docstring

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