tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Fri, 23 Jun 2006 08:10:06 +0200
changeset 2487 041363739ca8
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
Test case for #294

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)