diff mercurial/dirstate.py @ 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 882e703eaa94
children b1f10d3223c1
line wrap: on
line diff