Picked up some changes missed by the join of oacs-5-2 and oacs-5-3. It turns out the cvs won't join files if it has already done some merging previously. In this case I'd previously merged oacs-5-2 to HEAD, then branched oacs-5-3, then reopened the 5.2 branch for minor bug fixing for .LRN 2.2.1. This confused CVS or ... at least made it stubborn.
Loading ...