diff tests/test-rename-merge1.out @ 9476:a0e69510018b

merge with crew-stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 23 Sep 2009 15:54:43 +0200
parents af5f099d932b
children ba5e508b5e92
line wrap: on
line diff