diff tests/test-clone-failure.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 30c7564f6dfc
children aaeb7f5d1052
line wrap: on
line diff