diff tests/test-rename.out @ 3240:8d4855fd9d7b

merge: use new working context object in update
author Matt Mackall <mpm@selenic.com>
date Tue, 03 Oct 2006 01:21:46 -0500
parents b2ae81a7df29
children 36abb07c79d4
line wrap: on
line diff