tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Mon, 02 Oct 2006 22:03:14 -0500
changeset 3217 6d98149d70fe
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
contexts: add working dir and working file contexts add workingctx add workingfilectx extend filectx.annotate for rev=None extend filectx.ancestor

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