diff tests/test-parents.t @ 12294:f2f6d838064a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 14 Sep 2010 16:21:21 -0500
parents 6c8e824970d1
children 4134686b83e1
line wrap: on
line diff