view tests/test-simplemerge.py.out @ 7559:016a7319e76b

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Wed, 31 Dec 2008 18:00:35 -0600
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK