comparison tests/test-merge-local @ 10546:3a69afd6987e stable

fix test output changed by 2e1a9b811d13
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 25 Feb 2010 14:35:21 +0100
parents 46280c004f22
children 4c94b6d0fb1c
comparison
equal deleted inserted replaced
10545:b9e4a67329cd 10546:3a69afd6987e