diff tests/test-parents.out @ 7559:016a7319e76b

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Wed, 31 Dec 2008 18:00:35 -0600
parents 4b0c9c674707
children 0289f384e1e5
line wrap: on
line diff