Mercurial > hg
diff tests/test-simplemerge.py.out @ 15974:cd4504d26695 stable
merge with i18n
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Mon, 23 Jan 2012 16:11:37 -0200 |
parents | 2e3c54fb79a3 |
children | f18830651811 |
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Mon, 23 Jan 2012 16:11:37 -0200 |
parents | 2e3c54fb79a3 |
children | f18830651811 |