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

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