diff tests/test-annotate.out @ 3001:ad558f297eb1

merge: simplify some update logic
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 16:47:27 -0500
parents cd47230a4eb9
children 5c93dd0ae413
line wrap: on
line diff