Mercurial > hg
view tests/test-simplemerge.py.out @ 22132:a076a196641b
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 12 Aug 2014 17:22:57 -0500 |
parents | f18830651811 |
children |
line wrap: on
line source
................ ---------------------------------------------------------------------- Ran 16 tests in 0.000s OK