tests/test-merge5.out
author mpm@selenic.com
Sat, 27 Aug 2005 01:50:18 -0700
changeset 1086 50a8acefb53d
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Fix up help test

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)