diff tests/test-simple-update.out @ 3001:ad558f297eb1

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