diff tests/test-merge-default @ 3133:02b22fefc01f

changectx: add ancestor function
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 22:59:33 -0500
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff