tests/test-merge2.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 28 Dec 2008 20:21:20 +0100
changeset 7545 55e997c8bf62
parent 6336 4b0c9c674707
permissions -rw-r--r--
merge with -stable

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head