log tests/test-merge7.out @ 1449:30146be3437c

age author description
Tue, 27 Sep 2005 14:53:11 -0700 Matt Mackall Make test-merge7 repeatable