tests/test-merge5.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 05 May 2006 10:45:08 -0700
changeset 2214 6c6c0e5595a2
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
make test-confused-revert check working dir with two parents.

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)