view tests/test-simplemerge.py.out @ 18531:8caf566f4910 stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Feb 2013 15:23:37 -0600
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK