diff tests/test-rename-merge1.out @ 10044:dc5462d94a72

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