Mercurial > hg
view tests/test-simplemerge.py.out @ 12261:fac20d9b7cf2
merge with stable
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 12 Sep 2010 14:00:40 +0200 |
parents | 2e3c54fb79a3 |
children | f18830651811 |
line wrap: on
line source
.................... ---------------------------------------------------------------------- Ran 20 tests in 0.000s OK