diff tests/test-rename-merge2.out @ 9575:5e44d9e562bc

merge with hg-stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sat, 10 Oct 2009 12:19:58 +0200
parents af5f099d932b
children ba5e508b5e92
line wrap: on
line diff