diff tests/test-merge1.out @ 3431:145a8fde69e6

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