tests/test-merge5.out
author Lee Cantey <lcantey@gmail.com>
Thu, 13 Jul 2006 09:50:51 -0700
changeset 2611 1b4eb1f92433
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
Add merge to list of required tools.

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)