tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 15 Dec 2006 23:19:12 +0100
changeset 3901 733d56b8830f
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
fix strip on windows c: was interpreted as a protocol, prepend file: to the bundle file name

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