diff tests/test-incoming-outgoing.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 9cceb439048b
children b2d9e553cdc8 671158f060cc
line wrap: on
line diff