diff tests/test-merge-revert.out @ 10044:dc5462d94a72

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