log tests/test-merge7 @ 1353:a0c68981a5f4

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