view tests/test-simplemerge.py.out @ 20175:5ff0fd023850

merge with crew
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Dec 2013 12:59:32 -0600
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK