view tests/test-merge3.out @ 3133:02b22fefc01f

changectx: add ancestor function
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 22:59:33 -0500
parents 91c56c427171
children
line wrap: on
line source

removing b
nothing changed