diff tests/test-merge-default @ 2963:a8546e40070a

fix incoming -p
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 20 Aug 2006 02:21:51 -0300
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff