diff tests/test-merge10.out @ 4822:f48290864625

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Jul 2007 16:17:01 -0500
parents 59b8f9361545
children
line wrap: on
line diff