diff tests/test-merge6.out @ 3196:1605e336d229

Add localrepo.parents to get parent changectxs.
author Matt Mackall <mpm@selenic.com>
date Fri, 29 Sep 2006 15:48:16 -0500
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff