diff tests/test-strict.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 63c3a1921a67
children 509342f95564
line wrap: on
line diff