comparison mercurial/merge.py @ 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 cac7be0b9b99
children 8d4855fd9d7b
comparison
equal deleted inserted replaced
3235:e8199702cf4e 3236:696c656202a0