view tests/test-merge4.out @ 3236:696c656202a0

context: make filectx remember changectx in changectx.filectx
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Oct 2006 15:02:28 -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)