comparison tests/test-merge7.out @ 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 3fd098e0902d
children e7abcf3a7c5f
comparison
equal deleted inserted replaced
3235:e8199702cf4e 3236:696c656202a0