comparison tests/test-merge3.out @ 2979:92a0c2200e41

merge: use context code to retrieve manifests
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 19:32:16 -0500
parents 91c56c427171
children
comparison
equal deleted inserted replaced
2978:962b9c7df641 2979:92a0c2200e41