diff tests/test-simplemerge.py.out @ 15780:713ee57f817b

merge with stable
author Martin Geisler <mg@lazybytes.net>
date Fri, 06 Jan 2012 11:43:17 +0100
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line diff