log tests/test-merge7.out @ 3111:40e777bda455

age author description
Sun, 17 Sep 2006 17:13:02 -0500 Matt Mackall merge: remove linear variable
Tue, 22 Aug 2006 19:32:16 -0500 Matt Mackall merge: use context code to retrieve manifests
Wed, 09 Aug 2006 13:55:18 -0500 Matt Mackall Merge with crew, fix most tests