view tests/test-merge4.out @ 3319:6c68bc1e7873

context: change workingctx str() from . to <node>+
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 02:11:59 -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)