diff tests/test-rename-merge1.out @ 3898:316cd5b0c940

Merge with main
author Brendan Cully <brendan@kublai.com>
date Fri, 15 Dec 2006 11:14:55 -0800
parents 0fb66912040a
children 723e0ddb6ada
line wrap: on
line diff