diff tests/test-rename-merge2.out @ 4907:164daf101a54

Automated merge with http://hg.intevation.org/mercurial/crew
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 17 Jul 2007 15:26:27 -0700
parents 723e0ddb6ada
children f191bc3916f7
line wrap: on
line diff