tests/test-merge5.out

Web site and wiki are now the same.

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