comparison tests/test-merge1.out @ 3133:02b22fefc01f

changectx: add ancestor function
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 22:59:33 -0500
parents a31557193f3c
children 966632304dde 49966b5ab16f
comparison
equal deleted inserted replaced
3132:4d021b91cb26 3133:02b22fefc01f