comparison tests/test-merge-default.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 013921c753bd
children 9cd6578750b9
comparison
equal deleted inserted replaced
3007:962b9c7df641 3095:92a0c2200e41