Rename CVSNT "mergepoints" test and make it executable. - rename test-convert-cvs-builtincvsps-cvsnt-mergepoints (and related files) to test-convert-cvsnt-mergepoints - this ensures that the test will be run, but does NOT make it pass: in particularly, it fails regularly for me due to the inconsistent behaviour of CVS itself - expect "Branchpoints:" in debugcvsps output

adding a
adding b
adding c
% should succeed
200 Script output follows


/al/
/b/
/c/

200 Script output follows

a
200 Script output follows

b
200 Script output follows

c
% should fail
404 Not Found


error: repository circle not found
404 Not Found


error: repository circle not found
404 Not Found


error: repository circle not found
% collections errors