diff tests/test-commit.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 ef53d200df3d
children c9cd63a6fce9
line wrap: on
line diff