tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Mon, 17 Jul 2006 11:30:33 -0500
changeset 2630 837119f1bf4d
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
Merge with tonfa

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)