diff tests/test-simplemerge.py.out @ 14776:5efc32b013ce stable

merge with i18n
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Tue, 21 Jun 2011 18:37:15 -0300
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line diff