tests/test-merge5.out
author mpm@selenic.com
Tue, 13 Sep 2005 18:38:27 -0500
changeset 1236 67a28636ea64
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Fix bug with co -C across branches, update tests

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