diff tests/test-conflict.out @ 4816:5cc184800bf2

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Jul 2007 15:36:56 -0500
parents 93a4e72b4f83
children
line wrap: on
line diff