diff tests/test-conflict.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 46280c004f22
line wrap: on
line diff