log tests/test-merge7.out @ 3095:92a0c2200e41

age author description
Tue, 22 Aug 2006 19:32:16 -0500 Matt Mackall merge: use context code to retrieve manifests