Mercurial > public > mercurial-scm > hg-stable
view tests/test-simplemerge.py.out @ 13740:dcb51f156fa6
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 23 Mar 2011 12:38:36 -0500 |
parents | 2e3c54fb79a3 |
children | f18830651811 |
line wrap: on
line source
.................... ---------------------------------------------------------------------- Ran 20 tests in 0.000s OK