tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 24 Aug 2007 00:52:28 +0200
changeset 5217 551958d5082c
parent 3592 fffc8a733bf9
permissions -rw-r--r--
testcase for issue705 (fixed by 316ce5e85b3e)

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