diff tests/test-merge-default.out @ 7016:58dcf10eea2b

Backed out changeset 3d54cf97598d (see issue916 for details)
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 10 Sep 2008 08:48:23 +0200
parents 1fe6f365df2e
children 50b6af595e0c
line wrap: on
line diff