diff tests/test-conflict @ 3236:696c656202a0

context: make filectx remember changectx in changectx.filectx
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Oct 2006 15:02:28 -0500
parents e506c14382fd
children 46280c004f22
line wrap: on
line diff