log tests/test-rename-merge2.out @ 3280:ae85272b59a4

age author description
Fri, 06 Oct 2006 16:55:11 -0500 Matt Mackall merge: copy fixes and tests