log tests/test-merge7.out @ 3873:a41b01a3c29f

age author description
Tue, 10 Oct 2006 02:15:20 -0500 Matt Mackall merge: various tidying