log tests/test-rename-merge2.out @ 5483:0c43f87baba3 default tip

age author description
Fri, 05 Oct 2007 12:30:19 -0700 Bryan O'Sullivan Update test for new output produced since 17ed9b9a0d03