diff tests/test-rename-merge2.out @ 7836:bc0a87123ab8

Merge with main
author Brendan Cully <brendan@kublai.com>
date Fri, 06 Mar 2009 12:35:48 -0800
parents 5bf5fd1e2a74
children f325574dad1a
line wrap: on
line diff