diff tests/test-hgignore.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 0d36e3d7e2ea
children 4e521a3ee5eb
line wrap: on
line diff