log tests/test-merge5.out @ 3424:bf10cd8bc981

age author description
Wed, 09 Aug 2006 13:55:18 -0500 Matt Mackall Merge with crew, fix most tests