view tests/test-simplemerge.py.out @ 4822:f48290864625

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Jul 2007 16:17:01 -0500
parents 2e3c54fb79a3
children
line wrap: on
line source

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

OK