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

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

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)