view tests/test-merge2.out @ 7518:dd66d161a14b

merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 13 Dec 2008 13:28:20 +0100
parents 4b0c9c674707
children
line wrap: on
line source

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