diff tests/test-merge-default.out @ 7545:55e997c8bf62

merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 28 Dec 2008 20:21:20 +0100
parents 1fe6f365df2e
children 50b6af595e0c
line wrap: on
line diff