tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Mon, 09 Oct 2006 21:04:25 -0500
changeset 3304 45f0c49f0449
parent 2175 b2ae81a7df29
permissions -rw-r--r--
fix workingfilectx parents and ancestor functions

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)