diff tests/test-merge8.out @ 3416:145a8fde69e6

Update branch on checkout/update
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 18:30:20 -0500
parents efbe24c7d8d9
children 9103dab96093
line wrap: on
line diff