comparison tests/test-simplemerge.py.out @ 5336:24de027551c1

Merge with crew-stable
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 24 Sep 2007 19:14:18 -0300
parents 2e3c54fb79a3
children f18830651811
comparison
equal deleted inserted replaced
5328:8d00788ca578 5336:24de027551c1