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

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