tests/test-merge2.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 30 Mar 2009 01:30:58 +0200
changeset 7922 06bf76009249
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