view tests/test-merge2.out @ 1678:b345cc4c22c0

reverting 11d12bd6e1dcd9610fa26e97d25e7ad553e8ffa5 passing local everywhere violate the layering
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 15 Dec 2005 18:04:05 +0100
parents 5a034646e472
children b2ae81a7df29
line wrap: on
line source

adding b
adding b