view tests/test-merge3.out @ 10866:532138ba8a06 stable

merge stable with stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 06 Apr 2010 15:39:44 +0200
parents 91c56c427171
children
line wrap: on
line source

removing b
nothing changed