view tests/test-merge5.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 49988d9f0758
children 41989e55fa37
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes