diff tests/test-merge-default.out @ 4822:f48290864625

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