diff tests/test-merge1 @ 3431:145a8fde69e6

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