log tests/test-rename-merge2.out @ 3282:f49c90b46897

age author description
Fri, 06 Oct 2006 17:14:50 -0500 Matt Mackall Update test output
Fri, 06 Oct 2006 16:55:11 -0500 Matt Mackall merge: copy fixes and tests