diff tests/test-merge-default @ 5215:b0bc8cf41ffc

merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 24 Aug 2007 00:39:16 +0200
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff