diff tests/test-rename-merge1.out @ 7535:9a962209dc28

merge with crew-stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 19 Dec 2008 08:20:19 +0100
parents 368a4ec603cc
children af5f099d932b
line wrap: on
line diff