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

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)