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

merge: use context code to retrieve manifests
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 19:32:16 -0500
parents fb493241d7f6
children e18c3d08528d
line wrap: on
line diff