Mercurial > hg
view tests/test-simplemerge.py.out @ 26901:0e3d093c468e
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 11 Nov 2015 15:08:08 -0600 |
parents | f18830651811 |
children |
line wrap: on
line source
................ ---------------------------------------------------------------------- Ran 16 tests in 0.000s OK