comparison tests/test-annotate.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 5c93dd0ae413
children 2e1d8b238b6c
comparison
equal deleted inserted replaced
3239:6d98149d70fe 3240:8d4855fd9d7b