view tests/test-simplemerge.py.out @ 4484:c927c568a5ad

Automated merge with http://hg.intevation.org/mercurial/crew
author Bryan O'Sullivan <bos@serpentine.com>
date Sun, 27 May 2007 14:43:29 -0700
parents 2e3c54fb79a3
children
line wrap: on
line source

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK