tests/test-merge5.out
author mpm@selenic.com
Tue, 16 Aug 2005 21:33:50 -0800
changeset 930 0c4a6ad6efc1
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Fix incoming help test again

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)