diff tests/test-parents.out @ 4676:0f6e2b37512d

Merge with Eric Hopper
author Matt Mackall <mpm@selenic.com>
date Thu, 21 Jun 2007 18:05:14 -0500
parents 0d26e3d0eeeb
children be5dc5e3ab2d
line wrap: on
line diff