Mercurial > hg
view tests/test-simplemerge.py.out @ 32245:3a755652ce3a
merge with stable
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 12 May 2017 11:20:25 -0700 |
parents | f18830651811 |
children |
line wrap: on
line source
................ ---------------------------------------------------------------------- Ran 16 tests in 0.000s OK