diff tests/test-parents.t @ 17059:fba17a64fa49

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 29 Jun 2012 00:40:52 -0500
parents f2719b387380
children 4f9a52858512
line wrap: on
line diff