view tests/test-simplemerge.py.out @ 17602:ccd28eca37f6

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 18 Sep 2012 16:19:56 -0500
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK