diff tests/test-merge7.out @ 7538:8440baba78f0

merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 20 Dec 2008 00:43:03 +0100
parents 92ccccb55ba3
children 9fe7e6acf525
line wrap: on
line diff