diff tests/test-merge5 @ 3239:6d98149d70fe

contexts: add working dir and working file contexts add workingctx add workingfilectx extend filectx.annotate for rev=None extend filectx.ancestor
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Oct 2006 22:03:14 -0500
parents 39eb64b23cb5
children 41989e55fa37
line wrap: on
line diff