Fix error message in merge.
[u/mdw/catacomb] / tests / rc4
1999-09-03 mdwInitial import.