diff tests/test-merge7.out @ 3149:ff1ab08e6732

restore filectx.changectx() method
author Matt Mackall <mpm@selenic.com>
date Fri, 22 Sep 2006 15:34:02 -0500
parents 2ef0b3aae186
children 3fd098e0902d
line wrap: on
line diff