diff tests/test-merge1.out @ 3304:45f0c49f0449

fix workingfilectx parents and ancestor functions
author Matt Mackall <mpm@selenic.com>
date Mon, 09 Oct 2006 21:04:25 -0500
parents a31557193f3c
children 966632304dde 49966b5ab16f
line wrap: on
line diff