Mercurial > hg
view tests/test-simplemerge.py.out @ 19261:043abd6a91d1
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 01 Jun 2013 17:19:00 -0500 |
parents | 2e3c54fb79a3 |
children | f18830651811 |
line wrap: on
line source
.................... ---------------------------------------------------------------------- Ran 20 tests in 0.000s OK