diff tests/test-rename-merge2.out @ 5253:fd371f99f20b

Automated merge with http://hg.intevation.org/mercurial/crew
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 27 Aug 2007 13:38:34 -0700
parents f191bc3916f7
children 4b6f0aa568e5
line wrap: on
line diff