diff tests/test-merge-local.out @ 10230:9f0c7be7c46c

merge with stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 11 Jan 2010 21:45:28 +0100
parents a964ab624385
children 6f1894d6a6b0
line wrap: on
line diff