log tests/test-merge7.out @ 1636:7da32bb3d1d3

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