diff tests/test-merge2.out @ 4256:fe0fe0b4d73b

Merge additional fixes for my matcher changes
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 20 Mar 2007 22:21:05 -0300
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line diff