view tests/test-simplemerge.py.out @ 12586:b96de59a2c39

tests: fix 05210e955bef merge error in test-git-import.t
author Adrian Buehlmann <adrian@cadifra.com>
date Tue, 28 Sep 2010 19:29:14 +0200
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK