diff tests/test-simplemerge.py @ 10044:dc5462d94a72

Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Sat, 12 Dec 2009 16:54:33 +0100
parents e75aab656f46
children 08a0f04b56bd
line wrap: on
line diff