tests/test-merge5.out
author mpm@selenic.com
Wed, 24 Aug 2005 19:19:35 -0700
changeset 1043 9344f5dd4488
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
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)