comparison tests/test-simplemerge.py.out @ 9317:8c1df18452aa

Backed out changeset 5724cd7b3688 (depends on other changes, no tests)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 05 Aug 2009 16:32:38 +0200
parents 2e3c54fb79a3
children f18830651811
comparison
equal deleted inserted replaced
9310:5724cd7b3688 9317:8c1df18452aa