log tests/test-merge7.out @ 1914:a5bf0030df5f

age author description
Tue, 27 Sep 2005 14:53:11 -0700 Matt Mackall Make test-merge7 repeatable
Mon, 26 Sep 2005 16:52:47 -0700 Matt Mackall Repair ancestor logic, fix up test cases