view tests/test-simplemerge.py.out @ 20492:d0bca0649c7f

merge with crew
author Matt Mackall <mpm@selenic.com>
date Thu, 13 Feb 2014 15:33:24 -0600
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK