diff tests/test-merge-revert2.out @ 1679:675ca845c2f8

Merge with upstream
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 15 Dec 2005 18:04:39 +0100
parents 5a034646e472
children 3b1b44b917f4
line wrap: on
line diff