Mercurial > hg
view tests/test-simplemerge.py.out @ 29349:8bf84295e59b
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 14 Jun 2016 14:52:58 -0500 |
parents | f18830651811 |
children |
line wrap: on
line source
................ ---------------------------------------------------------------------- Ran 16 tests in 0.000s OK