view tests/test-merge5.out @ 2398:2d5745fd03fa

merge with crew.
author Vadim Gelfer <>
date Sun, 04 Jun 2006 10:30:46 -0700
parents b2ae81a7df29
line wrap: on
line source

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