diff tests/test-rename-merge1.out @ 4484:c927c568a5ad

Automated merge with http://hg.intevation.org/mercurial/crew
author Bryan O'Sullivan <bos@serpentine.com>
date Sun, 27 May 2007 14:43:29 -0700
parents 0fb66912040a
children 723e0ddb6ada
line wrap: on
line diff